Resolved merge conflict
66a6375405b6
Actions

Authored by Oliver Henrich <o.henrich@epcc.ed.ac.uk> on Mar 28 2017, 19:58.

Description

Resolved merge conflict

Committed

Oliver Henrich <o.henrich@epcc.ed.ac.uk>

Mar 28 2017, 19:58

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS604afebf6fef: Update to oxDNA2

Branches

Unknown

Tags

Unknown

Oliver Henrich <o.henrich@epcc.ed.ac.uk> committed rLAMMPS66a6375405b6: Resolved merge conflict (authored by Oliver Henrich <o.henrich@epcc.ed.ac.uk>).Mar 28 2017, 19:58

				Path
	M			doc/src/pair_oxdna.txt