[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/planet-kde-org] planetkde: Cleanup git conflict markers.
From:       Ben Cooksley <null () kde ! org>
Date:       2017-03-01 4:33:58
Message-ID: E1civxe-0005IA-M0 () code ! kde ! org
[Download RAW message or body]

Git commit c43981642c5db32053d009965613151ea66ba991 by Ben Cooksley.
Committed on 01/03/2017 at 04:33.
Pushed by bcooksley into branch 'master'.

Cleanup git conflict markers.
CCMAIL: arnav.dhamija@gmail.com

M  +0    -4    planetkde/config

https://commits.kde.org/websites/planet-kde-org/c43981642c5db32053d009965613151ea66ba991

diff --git a/planetkde/config b/planetkde/config
index abd9b0f..7b3c208 100644
--- a/planetkde/config
+++ b/planetkde/config
@@ -4348,11 +4348,7 @@ feed 15m https://g33kyaditya.wordpress.com/tag/kde/feed/
 feed 30m https://delsalife.wordpress.com/feed/
     define_name Andrea Del Sarto
 
-<<<<<<< HEAD
 feed 45m http://arnavdhamija.com/feeds/atom.xml
-=======
-feed 45m http://arnavdhamija.com/feeds/rss.xml
->>>>>>> 574198680aa569154280f1f4ee012a34d41d3f3d
 	define_name Arnav Dhamija (shortstheory)
     define_face hackergotchi/arnavdhamija.jpg
     define_facewidth 80
[prev in list] [next in list] [prev in thread] [next in thread]