Home Explore Help
Sign In
yangck
/
celery
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Removed unnecessary GIT conflict marker in CONTRIBUTORS.txt

Srinivas Garlapati 9 years ago
parent
f23106014f
commit
b652491845
1 changed files with 0 additions and 1 deletions
Split View Show Diff Stats
  1. 0 1
      CONTRIBUTORS.txt

+ 0 - 1
CONTRIBUTORS.txt
View File 

@@ -199,7 +199,6 @@ Krzysztof Bujniewicz, 2015/10/21
 
 Sukrit Khera, 2015/10/26
 
 Dave Smith, 2015/10/27
 
 Dennis Brakhane, 2015/10/30
 
-<<<<<<< HEAD
 
 Chris Harris, 2015/11/27
 
 Valentyn Klindukh, 2016/01/15
 
 Wayne Chang, 2016/01/15