Commit b9df5190 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 57426853
......@@ -29,4 +29,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "1"
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -40,4 +40,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -39,4 +39,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -49,4 +49,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -46,4 +46,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -41,4 +41,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -46,4 +46,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "1"
}
\ No newline at end of file
}
......@@ -50,4 +50,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -41,4 +41,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -48,4 +48,4 @@
"Version": "1.0"
},
"X-KDE-KMailEditor-Order": "2"
}
\ No newline at end of file
}
......@@ -28,4 +28,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -29,4 +29,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -44,4 +44,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
......@@ -40,4 +40,4 @@
],
"Version": "1.0"
}
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment