From a16ac6d7b7cbc0659124d273580b3d527a650cfd Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 12 Dec 2021 14:36:03 +0000
Subject: Post-Conflict Merge fixes.

---
 src/Java/gtPlusPlus/core/lib/CORE.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/lib')

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 7510f103a2..dfd536d21c 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -297,8 +297,6 @@ public class CORE {
 		public static int pollutionPerSecondMultiGeneratorArray;
 		public static int pollutionPerSecondMultiTreeFarm = 100;
 		public static int pollutionPerSecondMultiFrothFlotationCell = 0;
-		public static int pollutionPerSecondMultiNuclearReactor_ModeBoosted = 160;
-		public static int pollutionPerSecondMultiNuclearReactor_ModeNormal = 80;
 		public static int pollutionPerSecondMultiAutoCrafter = 500;
 		public static int pollutionPerSecondMultiThermalBoiler = 700;
 		public static int pollutionPerSecondMultiAlgaePond = 0;
-- 
cgit