[Libreoffice-commits] core.git: icon-themes/elementary

[jan iversen]

 icon-themes/elementary/links.txt |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit e53238368a860871e4bb6f486b7029b8d2b25537
Author: jan iversen <jani at documentfoundation.org>
Date:   Thu Jan 28 15:57:34 2016 +0100

    Corrected error in commit 696c9a90c42fabcdde342892073b1377e1249278
    
    removed "git merge" comments in links.txt
    
    Change-Id: I4d59167b3adac5f8a6057889e73e7e05edda8b6f

diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index c2be474..a8ae9d2 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