git conflict resolution
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Nov 2014 16:08:37 +0000 (16:08 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Nov 2014 16:08:37 +0000 (16:08 +0000)
commit49b7ceb43a431220124af095af5d705715d8ec8b
tree104d30b115f19d3288b0d5f0e0ce369abd5678ba
parent2420d32d1800074e7357587af270358c63b8c1bc
parent6407c5a12a5768eace1b7fd25cea265601b494c3
git conflict resolution
resources/templates/BioJSTemplate.txt