Commit 9880f41e 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 d9ce5850
Pipeline #58076 skipped
......@@ -73,7 +73,13 @@
],
"type": "Polygon"
},
"region": [ "AT", "CH", "DE", "LI", "LU" ]
"region": [
"AT",
"CH",
"DE",
"LI",
"LU"
]
}
},
"options": {
......
......@@ -66,7 +66,9 @@
],
"type": "Polygon"
},
"region": [ "EU" ]
"region": [
"EU"
]
}
},
"options": {
......
......@@ -41,12 +41,33 @@
"area": {
"coordinates": [
[
[ -180.0, -90.0 ], [ -180.0, 90.0 ], [ 180.0, 90.0 ], [ 180.0, -90.0 ], [ -180.0, -90.0 ]
[
-180.0,
-90.0
],
[
-180.0,
90.0
],
[
180.0,
90.0
],
[
180.0,
-90.0
],
[
-180.0,
-90.0
]
]
],
"type": "Polygon"
},
"region": [ "UN" ]
"region": [
"UN"
]
}
},
"options": {
......
......@@ -41,12 +41,33 @@
"area": {
"coordinates": [
[
[ -180.0, -90.0 ], [ -180.0, 90.0 ], [ 180.0, 90.0 ], [ 180.0, -90.0 ], [ -180.0, -90.0 ]
[
-180.0,
-90.0
],
[
-180.0,
90.0
],
[
180.0,
90.0
],
[
180.0,
-90.0
],
[
-180.0,
-90.0
]
]
],
"type": "Polygon"
},
"region": [ "UN" ]
"region": [
"UN"
]
}
},
"type": {
......
......@@ -48,12 +48,60 @@
"area": {
"coordinates": [
[
[ -180.0, -90.0 ], [ -180.0, 90.0 ], [ 180.0, 90.0 ], [ 180.0, -90.0 ], [ -180.0, -90.0 ]
[
-180.0,
-90.0
],
[
-180.0,
90.0
],
[
180.0,
90.0
],
[
180.0,
-90.0
],
[
-180.0,
-90.0
]
]
],
"type": "Polygon"
},
"region": [ "AT", "AU", "BE", "BR", "CA", "CH", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GH", "HU", "IE", "IL", "IT", "LU", "NI", "NL", "NZ", "PL", "PT", "RU", "SE", "UK", "US" ]
"region": [
"AT",
"AU",
"BE",
"BR",
"CA",
"CH",
"CZ",
"DE",
"DK",
"EE",
"ES",
"FI",
"FR",
"GH",
"HU",
"IE",
"IL",
"IT",
"LU",
"NI",
"NL",
"NZ",
"PL",
"PT",
"RU",
"SE",
"UK",
"US"
]
}
},
"options": {
......
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