diff options
Diffstat (limited to 'messages/ZmMsg_no.properties')
| -rw-r--r-- | messages/ZmMsg_no.properties | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/messages/ZmMsg_no.properties b/messages/ZmMsg_no.properties index eead598..635630f 100644 --- a/messages/ZmMsg_no.properties +++ b/messages/ZmMsg_no.properties @@ -1,4 +1,3 @@ -<<<<<<< HEAD # # # ***** BEGIN LICENSE BLOCK ***** @@ -7486,4 +7485,3 @@ actionUndoMove = {0} {3} {0,choice,1#move|2#moves} undone actionUndoTrash = {0} {3} {0,choice,1#move|2#moves} undone
actionUndoMarkAsJunk = {0} spam {0,choice,1#marking|2#markings} undone
actionUndoMarkAsNotJunk = {0} spam {0,choice,1#marking|2#markings} redone
->>>>>>> 07229ca4ee310ac2425118c7abc8ee5ae7c6e1da |