Remove a forgotten merge marker
tree4ca0bc2a8dc4cb9da1af61262500f05c6544bee4
-rw-r--r-- 348 .eclipse_iplog
-rw-r--r-- 17 .gitattributes
-rw-r--r-- 2274 EGIT_INSTALL
-rw-r--r-- 11252 LICENSE
-rw-r--r-- 4597 README
-rw-r--r-- 3781 SUBMITTING_PATCHES
drwxr-xr-x - org.eclipse.egit-feature
drwxr-xr-x - org.eclipse.egit-updatesite
drwxr-xr-x - org.eclipse.egit.core.test
drwxr-xr-x - org.eclipse.egit.core
drwxr-xr-x - org.eclipse.egit.doc
drwxr-xr-x - org.eclipse.egit.ui.test
drwxr-xr-x - org.eclipse.egit.ui
drwxr-xr-x - org.eclipse.egit
-rw-r--r-- 4383 pom.xml
drwxr-xr-x - tools