Resolve merge conflict for StructureImportSettings
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 21 Jul 2016 16:20:56 +0000 (17:20 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 21 Jul 2016 16:20:56 +0000 (17:20 +0100)

No differences found