Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

[unres.git] / source / xdrfpdb / src / xdrf2ang.f

diff --git a/source/xdrfpdb/src/xdrf2ang.f b/source/xdrfpdb/src/xdrf2ang.f
index a24d75d..f1c8472 100644 (file)
--- 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