git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2909 mininal merge of bam import demo to Jalview 2.11.2 develop
[jalview.git]
/
utils
/
checkstyle
/
import-control.xml
diff --git
a/utils/checkstyle/import-control.xml
b/utils/checkstyle/import-control.xml
index
478966f
..
5081770
100644
(file)
--- 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"/>
<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>
<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"/>
<allow pkg="uk.ac.vamsas"/>
<allow pkg="fr.orsay.lri.varna"/>
<allow pkg="MCview"/>
+<<<<<<< HEAD
<subpackage name="vcf">
<allow pkg="htsjdk\.*" regex="true"/>
</subpackage>
<subpackage name="vcf">
<allow pkg="htsjdk\.*" regex="true"/>
</subpackage>
+=======
+ <allow pkg="htsjdk.samtools"/>
+>>>>>>> origin/features/JAL-2909_bamImport2_11
</subpackage>
<subpackage name="javascript">
</subpackage>
<subpackage name="javascript">