remove conflict on javascript api
authorjprocter <Jim Procter>
Thu, 11 Oct 2007 11:18:44 +0000 (11:18 +0000)
committerjprocter <Jim Procter>
Thu, 11 Oct 2007 11:18:44 +0000 (11:18 +0000)
commit2c9763cd2221e919c42e5b38653fd383301986f9
tree430f886c500ddd67d0500eac8a3dccc4fc157543
parent4f4a80ee3f72370658cbbfdadf69bbfc2b20d54c
remove conflict on javascript api
src/jalview/bin/JalviewLite.java