resolving merge conflicts

[unres.git] / source / xdrfpdb / src / xdrf2pdb-m.F

diff --git a/source/xdrfpdb/src/xdrf2pdb-m.F b/source/xdrfpdb/src/xdrf2pdb-m.F
index 1fbf5af..61893ef 100644 (file)
--- 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