Removed old merge conflict in commit.

cboehme · cboehme · commit fce4dbde2368 · 2014-10-10T16:33:42.000+02:00
The javadoc of the `DefaultErrorHandler` had a merge conflict in the
javadoc of the class, which was not noticed and solved during an earlier
merge.
diff --git a/src/main/java/org/culturegraph/mf/morph/DefaultErrorHandler.java b/src/main/java/org/culturegraph/mf/morph/DefaultErrorHandler.java
@@ -19,13 +19,8 @@
 
 
 /**
-<<<<<<< HEAD
- * Default error handler used by {@link Metamorph}. Just repackages
- * exceptions as {@link MorphException}s.
-=======
  * Default error handler used by {@link Metamorph}. Just
  * repackages exceptions as {@link MorphException}s.
->>>>>>> Improved code formatting and added documentation.
  *
  * @author Markus Michael Geipel
  *

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,8 @@`
`19`	`19`
`20`	`20`
`21`	`21`	`/**`
`22`		`-<<<<<<< HEAD`
`23`		`- * Default error handler used by {@link Metamorph}. Just repackages`
`24`		`- * exceptions as {@link MorphException}s.`
`25`		`-=======`
`26`	`22`	`* Default error handler used by {@link Metamorph}. Just`
`27`	`23`	`* repackages exceptions as {@link MorphException}s.`
`28`		`->>>>>>> Improved code formatting and added documentation.`
`29`	`24`	`*`
`30`	`25`	`* @author Markus Michael Geipel`
`31`	`26`	`*`