Explorar o código

Removed unnecessary GIT conflict marker in CONTRIBUTORS.txt

Srinivas Garlapati %!s(int64=9) %!d(string=hai) anos
pai
achega
b652491845
Modificáronse 1 ficheiros con 0 adicións e 1 borrados
  1. 0 1
      CONTRIBUTORS.txt

+ 0 - 1
CONTRIBUTORS.txt

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