Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 297795d4 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 fe628b9d
......@@ -85,4 +85,4 @@
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -81,4 +81,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -74,4 +74,4 @@
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -74,4 +74,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -77,4 +77,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -118,4 +118,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -78,4 +78,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -78,4 +78,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -78,4 +78,4 @@
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -77,4 +77,4 @@
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -76,4 +76,4 @@
"X-KDE-Priority": 4,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -74,4 +74,4 @@
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -95,4 +95,4 @@
"X-KDE-Priority": 4,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ 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