Remove conflict-tags

git-svn-id: https://plugins.svn.wordpress.org/link-to-bible/trunk@1050553 b8457f37-d9ea-0310-8a92-e5e31aec5664