Mercurial > hg > soundsoftware-site

changeset 1529:df5b75a95193 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from live branch
author Chris Cannam
date Fri, 26 Sep 2014 09:48:15 +0100
parents c3edf97ea198 (current diff) 5047f066734d (diff)
children ae8145b28b2b
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/config/locales/de.yml	Thu Sep 11 12:46:30 2014 +0100
+++ b/config/locales/de.yml	Fri Sep 26 09:48:15 2014 +0100
@@ -993,7 +993,6 @@
   label_in: an
   label_today: heute
   label_all_time: gesamter Zeitraum
->>>>>>> other
   label_yesterday: gestern
 
   mail_body_account_activation_request: "Ein neuer Benutzer (%{value}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:"