Small Fix

fixed some issues in Strata.java and build.gradle.
Quizer9O8 · Jul 7, 2020 · 6c3a04d · 6c3a04d
1 parent ad9f1cd
commit 6c3a04d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,11 +13,8 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-<<<<<<< Updated upstream
-version = '1.15.2-1.0.2'
-=======
 version = '1.15.2-1.0.3'
->>>>>>> Stashed changes
+
 group = 'com.quizer9o8.strata' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'strata'
 

diff --git a/src/main/java/com/quizer9o8/strata/Strata.java b/src/main/java/com/quizer9o8/strata/Strata.java
@@ -1,9 +1,5 @@
 package com.quizer9o8.strata;
 
-<<<<<<< Updated upstream:src/main/java/com/quizer9o8/strata/Main.java
-=======
-
->>>>>>> Stashed changes:src/main/java/com/quizer9o8/strata/Strata.java
 import com.quizer9o8.strata.list.BlockList;
 import com.quizer9o8.strata.list.ItemList;
 import com.quizer9o8.strata.world.gen.StrataGeneration;
@@ -13,10 +9,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-<<<<<<< Updated upstream:src/main/java/com/quizer9o8/strata/Main.java
-import net.minecraftforge.fml.ModLoadingContext;
-=======
->>>>>>> Stashed changes:src/main/java/com/quizer9o8/strata/Strata.java
+
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;