X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fxdrfpdb%2Fsrc%2Fxdrf2pdb-m.F;h=61893ef6bcbff7b0327952456464d179f757a085;hb=85810a9b7a1db680103a165a406dd1f4d47e0632;hp=1fbf5af92caae2464c823cf435da997782f6a7cb;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

diff --git a/source/xdrfpdb/src/xdrf2pdb-m.F b/source/xdrfpdb/src/xdrf2pdb-m.F
index 1fbf5af..61893ef 100644
--- a/source/xdrfpdb/src/xdrf2pdb-m.F
+++ b/source/xdrfpdb/src/xdrf2pdb-m.F
@@ -13,11 +13,7 @@
       character*3 licz
       character*8 ucase
       external ucase
-<<<<<<< HEAD
       logical oneletter,iblnk
-=======
-      logical oneletter, iblnk
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       integer rescode
       external rescode