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=5714f40b72f62ef14f816ebf021146aff86d0b54;hpb=951f0fe4ce7a66542c398754524d8ae3d9b5dc5a;p=unres.git

diff --git a/source/xdrfpdb/src/xdrf2ang.f b/source/xdrfpdb/src/xdrf2ang.f
index 5714f40..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
       
@@ -48,6 +52,7 @@
         nres=i
         i=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,6 +65,7 @@
         nres=i
         i=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