diff options
| author | Philip Gabrielsen <philip@webcode.no> | 2012-02-11 11:38:30 +0100 |
|---|---|---|
| committer | Philip Gabrielsen <philip@webcode.no> | 2012-02-11 11:38:30 +0100 |
| commit | a66fad2030f331f9717bae76282e7b740a8a4a0b (patch) | |
| tree | edab72adcf1c7396f526af0566d43d4091b1dfc1 | |
| parent | 011454011bc107479f517fa89891e825192e0c22 (diff) | |
| download | Zimbra-Norwegian-a66fad2030f331f9717bae76282e7b740a8a4a0b.tar.gz Zimbra-Norwegian-a66fad2030f331f9717bae76282e7b740a8a4a0b.tar.xz Zimbra-Norwegian-a66fad2030f331f9717bae76282e7b740a8a4a0b.zip | |
Removed som misc error
| -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 |