Really allow .conf files

This adds on to commit 61b886c
SS111 · Sep 1, 2013 · b545284 · b545284
1 parent 8bbd23c
commit b545284
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/com/github/ss111/ConflictResolver.java b/src/com/github/ss111/ConflictResolver.java
@@ -50,7 +50,7 @@ public static void resolveConflicts(String path, ArrayList<Integer> unusedBlocks
 
 			ArrayList<String> lines = new ArrayList<String>();
 
-			if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt")) {
+			if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt") || configFile.getAbsolutePath().contains(".conf")) {
 
 				try {
 
@@ -195,7 +195,7 @@ public static void resolveConflicts(String path, ArrayList<Integer> unusedBlocks
 
 					ArrayList<String> lines = new ArrayList<String>();
 
-					if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt")) {
+					if (configFile.isFile() & configFile.getAbsolutePath().contains(".cfg") || configFile.getAbsolutePath().contains(".txt") || configFile.getAbsolutePath().contains(".conf")) {
 
 						try {