Commit eabdfc89 authored by Script Kiddy's avatar Script Kiddy

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 b1f6204c
......@@ -82,4 +82,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.battery"
]
}
}
\ No newline at end of file
......@@ -82,4 +82,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.clipboard"
]
}
}
\ No newline at end of file
......@@ -74,4 +74,4 @@
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.findmyphone.request"
]
}
}
\ No newline at end of file
......@@ -80,4 +80,4 @@
"kdeconnect.lock.request",
"kdeconnect.lock"
]
}
}
\ No newline at end of file
......@@ -80,4 +80,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mousepad.request"
]
}
}
\ No newline at end of file
......@@ -82,4 +82,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris.request"
]
}
}
\ No newline at end of file
......@@ -63,4 +63,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris"
]
}
}
\ No newline at end of file
......@@ -72,4 +72,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification"
]
}
}
\ No newline at end of file
......@@ -79,4 +79,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
}
}
\ No newline at end of file
......@@ -63,4 +63,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.ping"
]
}
}
\ No newline at end of file
......@@ -63,4 +63,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand"
]
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"kdeconnect.mousepad.request"
],
"X-KdeConnect-SupportedPackageType": []
}
}
\ No newline at end of file
......@@ -85,4 +85,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand.request"
]
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
}
}
}
\ No newline at end of file
......@@ -70,4 +70,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification.request"
]
}
}
\ No newline at end of file
......@@ -83,4 +83,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.sftp"
]
}
}
\ No newline at end of file
......@@ -82,4 +82,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.share.request"
]
}
}
\ No newline at end of file
......@@ -73,4 +73,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
}
}
\ 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