Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.1:Update
kile5
0017-SVN_SILENT-made-messages-.desktop-file-alw...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0017-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch of Package kile5
From fe468fb2c44d45c18dfe89423d0e100543b4aef7 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Wed, 10 Oct 2018 06:19:44 +0200 Subject: [PATCH 17/35] 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" --- src/org.kde.kile.desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/src/org.kde.kile.desktop b/src/org.kde.kile.desktop index 6d4fe9cb..f2481422 100644 --- a/src/org.kde.kile.desktop +++ b/src/org.kde.kile.desktop @@ -63,7 +63,6 @@ Comment[zh_TW]=(La)TeX 開發環境 Terminal=false Name=Kile Name[ar]=كايل -Name[ast]=Kile Name[be]=Kile Name[bg]=Kile Name[bs]=Kile -- 2.20.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
