make rebase easier

LCSB-BioCore · Feb 12, 2023 · 807ebf4 · 807ebf4
1 parent 794dc5c
commit 807ebf4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/types/accessors/AbstractMetabolicModel.jl b/src/types/accessors/AbstractMetabolicModel.jl
@@ -131,6 +131,7 @@ these values.
 """
 )
 
+<<<<<<< HEAD
 @make_variable_semantics(
     :enzyme_group,
     "enzyme group",
@@ -141,6 +142,8 @@ groups collect these sets of enzymes for convenient analysis.
 """
 )
 
+=======
+>>>>>>> 1fe1746e (make rebase easier)
 """
 $(TYPEDSIGNATURES)