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 dbd5852..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
-      logical oneletter
+<<<<<<< HEAD
+      logical oneletter,iblnk
+=======
+      logical oneletter, iblnk
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       integer rescode
       external rescode
       
@@ -47,8 +51,8 @@
    10   continue
         nres=i
         i=0
-c        do while (.not.iblnk(sequenc(i+1)(1:1)))
-        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0) )
+        do while (.not.iblnk(sequenc(i+1)(1:1)))
+c        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0) )
           i=i+1
         enddo 
         nres=i
@@ -60,7 +64,8 @@ c        do while (.not.iblnk(sequenc(i+1)(1:1)))
    11   continue
         nres=i
         i=0
-        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0) )
+        do while (.not.iblnk(sequenc(i+1)(1:1)))
+c        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0) )
           i=i+1
         enddo 
         nres=i