From dd8f660c4e6c97cbeb7a045cfa917f5bf36d57f4 Mon Sep 17 00:00:00 2001
From: Mario Pietsch <pmariojo@gmail.com>
Date: Sat, 7 May 2016 15:24:03 +0200
Subject: [PATCH] new german text elements

---
 languages/de-DE/Misc.multids | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids
index d83f67ac1..8dd34c2e7 100644
--- a/languages/de-DE/Misc.multids
+++ b/languages/de-DE/Misc.multids
@@ -50,4 +50,8 @@ TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
 Tiddler/DateFormat: DDth MMM YYYY um 0hh:0mm
 UnsavedChangesWarning: TiddlyWiki wurde geändert, aber noch nicht gespeichert!
-Yes: Ja
\ No newline at end of file
+<<<<<<< 8d35178bc45fdf150f6f165650febca4be98180c
+Yes: Ja
+=======
+Yes: Ja
+>>>>>>> new german text elements