mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-15 19:42:10 +01:00
f838f02db1
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" |
||
---|---|---|
.. | ||
AutoScroll | ||
FlashCookieManager | ||
GnomeKeyringPasswords | ||
GreaseMonkey | ||
KWalletPasswords | ||
MouseGestures | ||
PIM | ||
PyFalkon | ||
StatusBarIcons | ||
TabManager | ||
TestPlugin | ||
VerticalTabs | ||
CMakeLists.txt |