X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fcheckstyle%2Fimport-control.xml;fp=utils%2Fcheckstyle%2Fimport-control.xml;h=508177026e5b68ecdd8605aac3a577b40aa754a6;hb=d4a6a8430fa8d954b0fc5ecdcc6a7bda424224ad;hp=478966ffd49c170ef3995f912802df572c000a47;hpb=d80fbc33dfc7ece325c896b33c3296a075e48a30;p=jalview.git

diff --git a/utils/checkstyle/import-control.xml b/utils/checkstyle/import-control.xml
index 478966f..5081770 100644
--- a/utils/checkstyle/import-control.xml
+++ b/utils/checkstyle/import-control.xml
@@ -37,6 +37,7 @@
 		<subpackage name="datamodel">
 	    	<disallow pkg="jalview.gui"/>
 	    	<allow pkg="fr.orsay.lri.varna"/>
+	    	<allow pkg="htsjdk"/>
 			<subpackage name="xdb.embl">
 		    	<allow pkg="org.exolab.castor"/>
 		    </subpackage>
@@ -117,9 +118,13 @@
 	    	<allow pkg="uk.ac.vamsas"/>
 	    	<allow pkg="fr.orsay.lri.varna"/>
 	    	<allow pkg="MCview"/>
+<<<<<<< HEAD
 			<subpackage name="vcf">
 		    	<allow pkg="htsjdk\.*" regex="true"/>
 			</subpackage>	    
+=======
+	    	<allow pkg="htsjdk.samtools"/>
+>>>>>>> origin/features/JAL-2909_bamImport2_11
 		</subpackage>	    
 		   		
 		<subpackage name="javascript">