Merge branch 'master' into develop

WormBase · Jun 14, 2016 · 050b7f9 · 050b7f9
2 parents b1aaeac + b8f69be
commit 050b7f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # pseudoace
+[![Clojars Project](https://img.shields.io/clojars/v/wormbase/pseudoace.svg)](https://clojars.org/wormbase/pseudoace)
 
 Provides a Clojure library for use by the [Wormbase][1] project.
 

diff --git a/models/models.wrm.annot b/models/models.wrm.annot
@@ -455,7 +455,9 @@
 //   
 //////////////////////////////////////////////////////////////////////////////////////
 
-?Interaction    Interaction_type ^type ENUM Physical
+?Interaction    Interaction_type ^type ENUM Physical Proteinprotein
+                                                     ProteinDNA
+                                                     ProteinRNA
                                             Predicted
                                             Regulatory Change_of_localization
                                                        Change_of_expression_level
@@ -3445,11 +3447,12 @@
                   Person ?Person //
                   Analysis ?Analysis
                   Corresponding_transgene UNIQUE ?Transgene OUTXREF Corresponding_variation
-                  Production_method Homologous_recombination //Homologous_recombination
-                                    NHEJ //Non-homologous DNA end-joining, imprecise DNA repair
+                  Production_method CRISPR_Cas9
+                                    Homologous_recombination //Homologous_recombination
                                     MosSci
+                                    MosDEL
+                                    NHEJ //Non-homologous DNA end-joining, imprecise DNA repair
                                     TALENs
-                                    CRISPR_Cas9
                                     ZFNNHEJ_repair //Zinc-finger nuclease
                                     ZFNHR_repair
                   Expr_pattern ?Expr_pattern OUTXREF Variation #Evidence
@@ -3807,3 +3810,4 @@
 // WS252
 // WS253
 // WS254
+//