X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fxdrfpdb%2Fsrc%2Fxdrf2ang.f;h=763a945aa7a838bd39d9252e83484d38fb446c3a;hb=33ca65593386f7dce46c59efeb0f77b996757cbf;hp=f1c84720658939bdbacf6b9734463a58041c824a;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

diff --git a/source/xdrfpdb/src/xdrf2ang.f b/source/xdrfpdb/src/xdrf2ang.f
index f1c8472..763a945 100644
--- a/source/xdrfpdb/src/xdrf2ang.f
+++ b/source/xdrfpdb/src/xdrf2ang.f
@@ -14,11 +14,7 @@
       character*8 onethree,cfreq
       character*8 ucase
       external ucase
-<<<<<<< HEAD
       logical oneletter,iblnk
-=======
-      logical oneletter, iblnk
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       integer rescode
       external rescode