mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected error in commit 696c9a90c4

Browse Source 
removed "git merge" comments in links.txt

Change-Id: I4d59167b3adac5f8a6057889e73e7e05edda8b6f
This commit is contained in:
jan iversen
2016-01-28 15:57:34 +01:00
parent 63cada4791
commit e53238368a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
icon-themes/elementary/links.txt
View File

@@ -448,16 +448,12 @@ res/sx03227.png res/sx03160.png
res/sx03228.png res/sx03160.png res/sx03228.png res/sx03160.png
res/sx03243.png res/so03123.png res/sx03243.png res/so03123.png
res/sx03244.png res/so03123.png res/sx03244.png res/so03123.png
<<<<<<< HEAD
res/sx03245.png res/odb_16_8.png res/sx03245.png res/odb_16_8.png
res/sx03246.png res/odg_16_8.png res/sx03246.png res/odg_16_8.png
res/sx03247.png res/odf_16_8.png res/sx03247.png res/odf_16_8.png
res/sx03248.png res/odm_16_8.png res/sx03248.png res/odm_16_8.png
res/sx03249.png res/odp_16_8.png res/sx03249.png res/odp_16_8.png
res/sx03250.png res/ods_16_8.png res/sx03250.png res/ods_16_8.png
=======
res/sx03251.png res/odt_16_8.png
>>>>>>> tdf#95360 Fix use of icons used only from help, but not in the code
res/sx03256.png cmd/sc_addons.png res/sx03256.png cmd/sc_addons.png
sc/imglst/lc26047.png cmd/lc_insertformula.png sc/imglst/lc26047.png cmd/lc_insertformula.png
sc/imglst/lc26048.png cmd/lc_autosum.png sc/imglst/lc26048.png cmd/lc_autosum.png