resolve conflicts

common/api/core/src/main/java/com/dfsek/terra/api/Platform.java

@@ -19,8 +19,6 @@ import com.dfsek.terra.api.tectonic.LoaderRegistrar;
  * Represents a Terra mod/plugin instance.
  */
 public interface Platform extends LoaderRegistrar {
-    Logger logger();
-    
     boolean reload();
     
     String platformName();