X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fxdrfpdb%2Fsrc%2Fxdrf2ang.f;fp=source%2Fxdrfpdb%2Fsrc%2Fxdrf2ang.f;h=f1c84720658939bdbacf6b9734463a58041c824a;hb=52187c9365594597457799445140ea830f1141a3;hp=a24d75df8cde913e5279527eae7f677d3c5bef58;hpb=aebadf9023e437f497f92dfcf2303c16f60917c1;p=unres.git

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