[LON-CAPA-cvs] cvs: loncom /localize/localize de.pm

[droeschl]

droeschl		Sun Mar 29 21:06:53 2015 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
  Log:
  BZ 6776. removed leftover conflict marker.
  
  
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.604 loncom/localize/localize/de.pm:1.605
--- loncom/localize/localize/de.pm:1.604	Sun Mar 29 21:03:49 2015
+++ loncom/localize/localize/de.pm	Sun Mar 29 21:06:52 2015
@@ -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 @@
 => '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.'