Resolved merge conflict in EdtiCommandTest.java
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 23 Jul 2015 11:44:08 +0000 (12:44 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 23 Jul 2015 11:44:08 +0000 (12:44 +0100)
commit6897b5d861a256c94b23167254c3f4e2ab6acb3a
treea53f5ad211cb381a5a829ce5a52394aa49fb3b61
parent28fda83cbef0c9c82cd09a343af4e1721085c104
parent5c2d5149436c5e06767299160876206a4de10215
Resolved merge conflict in EdtiCommandTest.java
test/jalview/commands/EditCommandTest.java