From b545284f3db400a1bd076dffb1fb6893c99daa16 Mon Sep 17 00:00:00 2001
From: Sam Mauck <smmauck@gmail.com>
Date: Sun, 1 Sep 2013 14:40:06 -0600
Subject: [PATCH] Really allow .conf files

This adds on to commit 61b886c
---
 src/com/github/ss111/ConflictResolver.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/github/ss111/ConflictResolver.java b/src/com/github/ss111/ConflictResolver.java
index 5fe63a9..6eb9637 100644
--- 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 {