Remove unneeded initial array capacity

SS111 · Sep 1, 2013 · 8bbd23c · 8bbd23c
1 parent 61b886c
commit 8bbd23c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/com/github/ss111/ConflictResolver.java b/src/com/github/ss111/ConflictResolver.java
@@ -48,7 +48,7 @@ public static void resolveConflicts(String path, ArrayList<Integer> unusedBlocks
 
 		for (File configFile : configFiles) {
 
-			ArrayList<String> lines = new ArrayList<String>(2000);
+			ArrayList<String> lines = new ArrayList<String>();
 
 			if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt")) {
 
@@ -193,7 +193,7 @@ public static void resolveConflicts(String path, ArrayList<Integer> unusedBlocks
 
 				for (File configFile : configFilesDir) {
 
-					ArrayList<String> lines = new ArrayList<String>(2000);
+					ArrayList<String> lines = new ArrayList<String>();
 
 					if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt")) {
 
@@ -329,5 +329,4 @@ public static void resolveConflicts(String path, ArrayList<Integer> unusedBlocks
 			}
 		}
 	}
-
 }