fixup after merge

toolbox4minecraft · Mar 20, 2020 · 4cbe211 · 4cbe211
1 parent 595765e
commit 4cbe211
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/main/java/amidst/AmidstSettings.java b/src/main/java/amidst/AmidstSettings.java
@@ -49,7 +49,6 @@ public class AmidstSettings {
 	@CalledOnlyBy(AmidstThread.EDT)
 	public AmidstSettings(Preferences preferences) {
 		// @formatter:off
-<<<<<<< HEAD
 		dimension                  = Setting.createDimension(preferences, "dimension",            Dimension.OVERWORLD);
 		showGrid                   = Setting.createBoolean(  preferences, "grid",                 false);
 		showSlimeChunks            = Setting.createBoolean(  preferences, "slimeChunks",          false);

diff --git a/src/main/java/amidst/fragment/layer/LayerBuilder.java b/src/main/java/amidst/fragment/layer/LayerBuilder.java
@@ -82,7 +82,6 @@ public LayerManager create(
 	private List<LayerDeclaration> createDeclarations(AmidstSettings settings, List<Integer> enabledLayers) {
 		LayerDeclaration[] declarations = new LayerDeclaration[LayerIds.NUMBER_OF_LAYERS];
 		// @formatter:off
-<<<<<<< HEAD
 		declare(settings, declarations, enabledLayers, LayerIds.ALPHA,           null,                false, Setting.createImmutable(true));
 		declare(settings, declarations, enabledLayers, LayerIds.BIOME_DATA,      Dimension.OVERWORLD, false, Setting.createImmutable(true));
 		declare(settings, declarations, enabledLayers, LayerIds.END_ISLANDS,     Dimension.END,       false, Setting.createImmutable(true));