From 66a6375405b658eef8e97f52cfcac47b10f068ad Mon Sep 17 00:00:00 2001
From: Oliver Henrich <o.henrich@epcc.ed.ac.uk>
Date: Tue, 28 Mar 2017 18:58:31 +0100
Subject: [PATCH] Resolved merge conflict

---
 doc/src/pair_oxdna.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/src/pair_oxdna.txt b/doc/src/pair_oxdna.txt
index 61456259c2..0a07417fd0 100644
--- a/doc/src/pair_oxdna.txt
+++ b/doc/src/pair_oxdna.txt
@@ -62,13 +62,8 @@ When using a Langevin thermostat, e.g. through "fix langevin"_fix_langevin.html
 or "fix nve/dotc/langevin"_fix_nve_dotc_langevin.html
 the temperature coefficients have to be matched to the one used in the fix.
 
-<<<<<<< HEAD
 Example input and data files for DNA duplexes can be found in examples/USER/cgdna/examples/oxDNA/ and /oxDNA2/.
 A simple python setup tool which creates single straight or helical DNA strands,
-=======
-Example input and data files can be found in examples/USER/cgdna/examples/duplex1/ and /duplex2/.
-A simple python setup tool which creates single straight or helical DNA strands, 
->>>>>>> master
 DNA duplexes or arrays of DNA duplexes can be found in examples/USER/cgdna/util/.
 A technical report with more information on the model, the structure of the input file,
 the setup tool and the performance of the LAMMPS-implementation of oxDNA
-- 
GitLab