X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA_DiL%2Fenergy_p_new_barrier.F;h=c1e8ad3025e2678f4ce802dca2c8faf38ad2f461;hb=e78d6abb35d20fa7f376cf97ab339fae02b071da;hp=b4e0b64a8f1d655ee62c356254c3cc7fb5cc7dd3;hpb=a27cfab85360a3d64f00117d86dedaac9ecbd37f;p=unres.git

diff --git a/source/unres/src_CSA_DiL/energy_p_new_barrier.F b/source/unres/src_CSA_DiL/energy_p_new_barrier.F
index b4e0b64..c1e8ad3 100644
--- a/source/unres/src_CSA_DiL/energy_p_new_barrier.F
+++ b/source/unres/src_CSA_DiL/energy_p_new_barrier.F
@@ -4485,9 +4485,6 @@ c     write (*,'(a,i2)') 'EBEND ICG=',icg
       do i=ithet_start,ithet_end
 C Zero the energy function and its derivative at 0 or pi.
         call splinthet(theta(i),0.5d0*delta,ss,ssd)
-<<<<<<< HEAD
-        it=iabs(itype(i-1))
-=======
         it=itype(i-1)
         ichir1=isign(1,itype(i-2))
         ichir2=isign(1,itype(i))
@@ -4501,7 +4498,6 @@ C Zero the energy function and its derivative at 0 or pi.
          ichir21=isign(1,itype(i))
          ichir22=isign(1,itype(i))
         endif
->>>>>>> bartek2
         if (i.gt.3) then
 #ifdef OSF
 	  phii=phi(i)