From b7fa330b889ab66285df9439a66a811aade9d7b8 Mon Sep 17 00:00:00 2001
From: Christian Claus Wiechmann <ccw@informatik.uni-kiel.de>
Date: Fri, 3 Jul 2015 05:44:40 +0200
Subject: [PATCH] Correction of previous merge

---
 .settings/edu.umd.cs.findbugs.core.prefs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 92e055e5a..47121da30 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,14 +1,6 @@
 #FindBugs User Preferences
-<<<<<<< HEAD
-<<<<<<< Upstream, based on origin/master
 #Thu Jun 25 14:06:30 CEST 2015
 detector_threshold=2
-=======
-=======
->>>>>>> branch 'ccw' of http://build.se.informatik.uni-kiel.de/gitlab/chw/teetime.git
-#Wed Jun 24 14:05:03 CEST 2015
-detector_threshold=3
->>>>>>> 73c50f5 added TaskFarmDuplicable
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
 filter_settings=Max|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15
-- 
GitLab