summaryrefslogtreecommitdiff
path: root/icon-themes/elementary
diff options
context:
space:
mode:
Diffstat (limited to 'icon-themes/elementary')
-rw-r--r--icon-themes/elementary/links.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index c2be4745baec..a8ae9d2d2c7a 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -448,16 +448,12 @@ res/sx03227.png res/sx03160.png
res/sx03228.png res/sx03160.png
res/sx03243.png res/so03123.png
res/sx03244.png res/so03123.png
-<<<<<<< HEAD
res/sx03245.png res/odb_16_8.png
res/sx03246.png res/odg_16_8.png
res/sx03247.png res/odf_16_8.png
res/sx03248.png res/odm_16_8.png
res/sx03249.png res/odp_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
sc/imglst/lc26047.png cmd/lc_insertformula.png
sc/imglst/lc26048.png cmd/lc_autosum.png