diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index 7f7ebeac8..f738e9cfd 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -19,18 +19,10 @@
 <!ENTITY menu-edit:label              	"Bearbeiten">
 <!ENTITY menu-edit:accesskey          	"B">
 
-<<<<<<< .mine
 <!ENTITY menu-edit-undo:key           	"">
 <!ENTITY menu-edit-undo:label         	"Undo">
 <!ENTITY menu-edit-undo:accesskey     	"">
 
-
-=======
-<!ENTITY menu-edit-undo:key           	"">
-<!ENTITY menu-edit-undo:label         	"Undo">
-<!ENTITY menu-edit-undo:accesskey     	"">
-
->>>>>>> .r298
 <!ENTITY menu-prefs:label              	"Einstellungen">
 <!ENTITY menu-prefs:accesskey          	"E">
 
diff --git a/locale/de-AT/tempus.dtd b/locale/de-AT/tempus.dtd
index c732f5879..340b43c07 100644
--- a/locale/de-AT/tempus.dtd
+++ b/locale/de-AT/tempus.dtd
@@ -1,5 +1,5 @@
 <!ENTITY window.title			"Tempus"> 
-<!ENTITY window.version			"2.0alpha vom 8.Januar 2007"> 
+<!ENTITY window.version			"2.0 vom 12.Feb.2007"> 
 
 
 <!ENTITY menu-file:label              	"Datei">