--- loncom/localize/localize/de.pm	2015/03/29 21:03:49	1.604
+++ loncom/localize/localize/de.pm	2015/03/29 21:06:52	1.605
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.604 2015/03/29 21:03:49 droeschl Exp $
+# $Id: de.pm,v 1.605 2015/03/29 21:06:52 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29739,7 +29739,6 @@ erhalten Sie auf die gesamte Nachricht Z
 => 'CodeMirror im Autorenbereich deaktivieren',
 
    'Processing your submission ...'
-<<<<<<< de.pm
 => 'Ihre Einreichung wird verarbeitet ...',
 
    'As a result, your LON-CAPA session is being redirected to the server where you originally logged in.'