Fix merge conflict

JabRef · Aug 25, 2015 · 4e5f361 · 4e5f361
1 parent 490e605
commit 4e5f361
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/net/sf/jabref/external/SynchronizeFileField.java b/src/main/java/net/sf/jabref/external/SynchronizeFileField.java
@@ -268,11 +268,6 @@ public void run() {
             }
         }
 
-        //for (BibtexEntry entr : changedEntries)
-<<<<<<< .merge_file_a06136
-=======
-        //    System.out.println(entr.getCiteKey());
->>>>>>> .merge_file_a00932
         if (!changedEntries.isEmpty()) {
             // Add the undo edit:
             ce.end();