M: removed Git error

easylist · Sep 2, 2016 · 7865398 · 7865398
1 parent 993ecee
commit 7865398
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/easylistgermany/easylistgermany_specific_hide.txt b/easylistgermany/easylistgermany_specific_hide.txt
@@ -2311,9 +2311,6 @@ autoextrem.de,teccentral.de##.yui-sidebar li > a > img
 autoextrem.de,teccentral.de,winboard.org##.yui-sidebar li > span > a > img
 magistrix.de##.zeezee
 german-bash.org##.zitat > div[style="width:300px;"]
-<<<<<<< HEAD
-=======
->>>>>>> 6afcdabf6e20a96e3da53c5759167bc8f5e24f63
 listsandnews-de.net##A[href^="http://www.dekarrierejournal.com/index.php?A="]
 320k.in##A[href^="http://www.yellow-ducks.com/AF_"]
 chip.de##A[title="Amazon Instant Video"][target="_blank"]