Fixed merge issue of prefs file

Author: keilw

money-tck/.settings/org.eclipse.core.resources.prefs

@@ -1,7 +1,3 @@
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
->>>>>>>=c7123b231c4b4a9bab0a0369207370cfdcd53ff9
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8