Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-15 11:32:11 +01:00
Code Releases Activity
6,404 Commits 25 Branches 54 Tags 53 MiB
95b1f3ce3c
Commit Graph

898 Commits

Author SHA1 Message Date
l10n daemon script
d7f8b9a3d3 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"
 2022-08-14 01:43:43 +00:00
Laurent Montel
2228bd502e Show more headers in qtc6 2022-07-06 13:25:16 +02:00
l10n daemon script
43114cafd8 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"
 2022-07-02 02:00:11 +00:00
Laurent Montel
5ce71aa6e1 Add missing override 2022-06-27 19:25:20 +02:00
Laurent Montel
424340e392 Use Q_EMIT/nullptr/fix gcc warning 2022-06-27 19:13:24 +02:00
Laurent Montel
271c5f8a6b Port deprecated enum 2022-06-22 07:51:18 +02:00
Laurent Montel
13092decbb Show more headers in qtc6 2022-06-22 07:49:32 +02:00
Laurent Montel
42db837288 Remove duplicate headers between cpp/h 2022-06-21 13:25:18 +02:00
Laurent Montel
3fa1e81105 Modernize code 2022-06-19 09:25:06 +02:00
Laurent Montel
4543c74436 Use QStringLiteral + use nullptr 2022-06-19 08:35:11 +02:00
Laurent Montel
d6c4035ff6 We depend against qt5.15 2022-06-18 07:37:18 +02:00
Laurent Montel
1906529b68 Show headers in qtc6 + we can use qt cmake macro as we depend against 
qt5.15
 2022-06-16 19:24:50 +02:00
l10n daemon script
684d4cd1d2 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"
 2022-06-13 02:25:21 +00:00
l10n daemon script
de0229a3de 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"
 2022-06-07 02:11:41 +00:00
l10n daemon script
3ef3fd6ad0 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"
 2022-03-05 01:43:20 +00:00
Kevin Kofler
b6131a2de9 Revert "Remove GnomeKeyringPasswords plugin" 
This reverts commit b9fb89a31c.

This plugin was removed due to the underlying library being deprecated
and removed from some distributions. However:

* the gnome-keyring library is still available in Fedora Rawhide,
* the plugin is optional, and the availability of the library is
  automatically detected, so having the plugin available will not hurt
  users who do not have access to the underlying library, as Falkon will
  just be built without the optional plugin then,
* distribution packagers can put the plugin into an optional subpackage
  (which I have always done in Fedora to begin with),
* a replacement plugin using libsecret (the upstream replacement for
  libgnome-keyring) is still not available, and
* perhaps most importantly: not having the plugin available leaves users
  with no easy way to access their existing saved passwords (due to no
  libsecret plugin being available), which is IMHO not acceptable.
 2022-01-18 14:59:43 +00:00
l10n daemon script
0568905c67 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"
 2021-08-23 01:25:48 +00:00
l10n daemon script
1c2c8ab982 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"
 2021-07-15 01:14:50 +00:00
Ahmad Samir
5d0c9bb238 [KWalletPasswordBackend] Port KWallet::readEntryList() to KWallet::entriesList() 
Currently the code is conditional so as to keep it building against
older kwallet versions.
 2021-03-06 18:10:25 +00:00
Juraj Oravec
79b356cce5 VerticalTabs - Accept click event on tree collapse 
Very often when the tree collapse/expand button was pressed apart from
expected function the dragging of the tab group started.

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-03-06 00:49:42 +00:00
l10n daemon script
1ccd81ecf1 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"
 2020-12-29 06:14:58 +01:00
Antonio Rojas
9fac57e8fe Fix PyFalkon build with shiboken 5.15.2 
Prevent Qz::sessionVersion form being wrapped, since it is not exported in the shared library.

BUG: 429414
 2020-11-20 21:52:34 +01:00
l10n daemon script
a661ac27d4 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"
 2020-11-01 06:34:37 +01:00
l10n daemon script
02bf543919 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"
 2020-10-29 06:36:15 +01:00
l10n daemon script
9d8a727f9f 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"
 2020-09-05 06:13:09 +02:00
l10n daemon script
6fe0f76294 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"
 2020-09-04 06:00:13 +02:00
Nicolas Fella
5ed4e01ce0 Fix page sharing via Purpose 
Purpose expects a list of URLs, not a single URL
 2020-08-26 01:20:45 +02:00
l10n daemon script
cc6fc7a4fa 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"
 2020-07-29 06:01:26 +02:00
l10n daemon script
3bb9314603 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"
 2020-06-24 05:54:22 +02:00
l10n daemon script
6765b10f8d 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"
 2020-06-18 05:39:07 +02:00
l10n daemon script
6e4afc466c 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"
 2020-06-17 14:06:46 +02:00
Puneeth Chanda
e4b468e233 Prompt user when KWallet is disabled 
Summary: From now, when the user saves the password by clicking remember he will get a notification that the password is saved.

Reviewers: SGOrava, drosca

Reviewed By: SGOrava, drosca

Subscribers: drosca, alukichev, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26932
 2020-02-15 16:19:02 +01:00
Puneeth Chanda
1cecd14fd0 Fix crash when KWallet is not available. 
Summary:
Bug 398767
Currently, when the user clicks //remember password// when KWallet is disabled, **falkon** gets crashed.
This patch fixes the crash by checking if `KWallet` object is created and only then it adds to the folder.
The following functions are fixed:

  - addEntry

  - Update Entry

  - updateLastUsed

  - removeEntry

  - removeAll

Reviewers: SGOrava, drosca

Reviewed By: SGOrava, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26872
 2020-01-24 14:15:11 +01:00
Juraj Oravec
903c29cb09
GreaseMonkey: Use QTWEBENGINEWIDGETS_VERSION to check for the current version 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2020-01-06 11:45:10 +01:00
Juraj Oravec
6974f8c254 GreaseMonkey: Fix detecting *.user.js urls 
Test Plan: Try to install userscript from http://greasyfork.org/

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26436
 2020-01-05 19:39:46 +01:00
Juraj Oravec
de200c77c4
Port from deprecated QFontMetrics::width() > QFontMetrics::horizontalAdvance() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 15:38:48 +01:00
Juraj Oravec
def38a2da4
TabManager: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:36:35 +01:00
Juraj Oravec
9330f8cc04
FCM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:20:44 +01:00
Juraj Oravec
9bcfeb3cd7
GM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:05:24 +01:00
Juraj Oravec
c9a6a51285
KDEFI: Constify for arguments 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:03:50 +01:00
Juraj Oravec
7f567b8536
SBI: Fix typo 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:32:08 +01:00
Juraj Oravec
6370bcf6c8
KDEFI: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:28:38 +01:00
Juraj Oravec
52370301aa
PIM: Fix typo, missing brackets around if 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:24:00 +01:00
Juraj Oravec
be4d55795f
PIM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:22:20 +01:00
Juraj Oravec
ff94cf69da
StatusBarIcons: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:00:28 +01:00
Albert Astals Cid
95790ce9e5 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-12-14 00:32:31 +01:00
Albert Astals Cid
29f96b7504 Fix lupdate warnings 
Summary:
Class 'XXX' lacks Q_OBJECT macro

If you use tr() in a class it needs Q_OBJECT

Test Plan: It builds

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D25911
 2019-12-14 00:32:16 +01:00
l10n daemon script
c2b4350521 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"
 2019-12-03 05:37:17 +01:00
Laurent Montel
bbde5c6955 Add missing include in last qt5.14 2019-12-02 13:30:36 +01:00
David Rosca
2d5bf8d45f
Merge branch 'Falkon/3.1' 2019-10-31 11:23:40 +01:00
David Rosca
bfb9420cbb
PyFalkon: Fix C linkage issues 
BUG: 413093
FIXED-IN: 3.1.1
 2019-10-31 10:37:24 +01:00
l10n daemon script
1363b848a5 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"
 2019-09-30 08:39:50 +02:00
Laurent Montel
c772438470 GIT_SILENT: minor qstring optimization 2019-09-13 08:03:02 +02:00
l10n daemon script
74e55c59d3 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"
 2019-09-05 09:04:23 +02:00
l10n daemon script
8b4d2556a0 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"
 2019-08-31 08:46:56 +02:00
l10n daemon script
821b1c6f81 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"
 2019-08-30 09:20:27 +02:00
l10n daemon script
6f1c729906 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"
 2019-08-13 05:19:36 +02:00
l10n daemon script
3fdd1d95d3 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"
 2019-06-21 08:51:00 +02:00
l10n daemon script
483f5f70b5 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"
 2019-06-19 08:52:28 +02:00
Juraj Oravec
dfb3d2357d
Vertical Tabs: Add child tab with middle click on "New Tab" button 
Summary:
BUG: 393656

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21664
 2019-06-10 12:07:26 +02:00
David Rosca
4b85dab3d7
Vertical tabs: Draw unloaded tabs with "Disabled" color palette 
Summary: BUG: 405833

Reviewers: #falkon

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21548
 2019-06-03 17:42:42 +02:00
l10n daemon script
44c85c7f65 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"
 2019-05-30 08:26:40 +02:00
l10n daemon script
2887d87ed5 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"
 2019-05-30 05:09:20 +02:00
l10n daemon script
cc248c72c8 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"
 2019-05-25 08:42:22 +02:00
David Rosca
2098d69ad1
PyFalkon: Fix build with clang 
BUG: 407734
FIXED-IN: 3.2.0
 2019-05-20 15:21:09 +02:00
David Rosca
fb09c266a7
VerticalTabs: Corectly recognize tree collapse / expand button 
Summary:
In treeview when the tab has no children the collapse / expand button
is not visible but the control logic still thought that is is.
By clicking on place where this button normaly is nothing happens
and user has to click again somewhere else to change the selected tab.

Test Plan:
In treeview mode check the function of collapse / expand button when visible and invisible.

  - Visible: Expand / collapse the tree
  - Not visible: Select tab

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21304
 2019-05-20 15:03:28 +02:00
l10n daemon script
8393f62ad4 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"
 2019-05-04 08:50:18 +02:00
David Rosca
ee4dbad676
Merge branch 'Falkon/3.1' 2019-04-22 09:50:50 +02:00
David Rosca
b9fb89a31c
Remove GnomeKeyringPasswords plugin 
Modern distributions no longer have the deprecated library in repos.
 2019-04-21 11:03:35 +02:00
David Rosca
9828237159
Plugins: Use embedded JSON metadata for shared library plugins 
It is no longer needed to load the library to retrieve metadata.
 2019-04-21 11:03:26 +02:00
David Rosca
92721449c0
VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts 2019-04-20 19:26:00 +02:00
David Rosca
dc3063fc63
Fix loading Python/QML extensions on startup 2019-04-20 16:54:06 +02:00
l10n daemon script
c5e1aab96a 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"
 2019-04-20 09:03:19 +02:00
l10n daemon script
e4299fb85c 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"
 2019-04-20 06:00:37 +02:00
David Rosca
d2d3d45932
Don't use subfolders for QML/Python extensions 2019-04-19 11:38:15 +02:00
David Rosca
7a562a4847
Plugins: Implement removing locally installed plugins 2019-04-18 11:52:25 +02:00
David Rosca
a3e320fb47
KWalletPasswordBackend: Add overrides 2019-04-18 10:54:22 +02:00
David Rosca
e44ba37063
Merge branch 'Falkon/3.1' 2019-04-18 10:24:47 +02:00
David Rosca
232eaa54bd
KDEFrameworksIntegration: Create Purpose menu in init 2019-04-17 16:28:45 +02:00
l10n daemon script
6e98af2f1c 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"
 2019-04-10 09:15:23 +02:00
l10n daemon script
61f3cd89a1 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"
 2019-04-08 08:42:31 +02:00
l10n daemon script
ae495bcc60 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"
 2019-04-08 05:48:04 +02:00
l10n daemon script
bde26dc861 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"
 2019-04-06 05:57:30 +02:00
David Rosca
cb30ecb994
Merge branch 'Falkon/3.1' 2019-04-05 20:40:15 +02:00
l10n daemon script
f322c4ed94 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"
 2019-04-04 09:01:22 +02:00
l10n daemon script
4c2b453573 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"
 2019-04-02 09:00:21 +02:00
l10n daemon script
95661276c5 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"
 2019-04-01 08:54:43 +02:00
l10n daemon script
2a7176946b 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"
 2019-03-31 09:30:03 +02:00
l10n daemon script
739f0d20d6 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"
 2019-03-28 08:45:05 +01:00
David Rosca
479933e095
PyFalkon: Fix build with Qt 5.12.2 
BUG: 405833
FIXED-IN: 3.1.1
 2019-03-25 11:38:27 +01:00
l10n daemon script
2743002b2d 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"
 2019-03-25 08:53:45 +01:00
l10n daemon script
dc140a7053 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"
 2019-03-24 08:25:04 +01:00
l10n daemon script
f712500b2c 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"
 2019-03-23 09:02:28 +01:00
l10n daemon script
1f1978751f 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"
 2019-03-23 06:07:37 +01:00
l10n daemon script
d729117adb 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"
 2019-03-22 08:32:02 +01:00
l10n daemon script
c3dce2aa80 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"
 2019-03-21 08:45:27 +01:00
David Rosca
b87ccf714c
Fix all override warnings 2019-03-01 17:08:50 +01:00
l10n daemon script
1553ab3c1b 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"
 2019-02-16 05:37:34 +01:00
l10n daemon script
8ffd2f20df 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"
 2019-02-13 05:51:49 +01:00
l10n daemon script
29486c2f62 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"
 2019-02-09 05:37:42 +01:00