[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch master updated: merge
From: |
gnunet |
Subject: |
[www] branch master updated: merge |
Date: |
Fri, 12 Mar 2021 16:10:20 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 12736c4 merge
12736c4 is described below
commit 12736c4e95c5e889feef049a3352d9bc78a5f99d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Mar 12 16:08:48 2021 +0100
merge
---
locale/es/LC_MESSAGES/messages.po | 3 ---
1 file changed, 3 deletions(-)
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index cccfca0..abf97b0 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1967,13 +1967,10 @@ msgstr ""
msgid "Overview"
msgstr "visión general"
-<<<<<<< HEAD
-=======
#: template/gns.html.j2:37
msgid "Features"
msgstr "CaracterÃsticas"
->>>>>>> weblate/master
#: template/gns.html.j2:39
msgid ""
"The GNU Name System (GNS) is secure and decentralized naming system. It "
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [www] branch master updated: merge,
gnunet <=