Remove merge remnants

mklauser · May 8, 2014 · 4300c01 · 4300c01
1 parent 1a1c2b4
commit 4300c01
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/tardis/data/tardis_config_definition.yml b/tardis/data/tardis_config_definition.yml
@@ -166,29 +166,15 @@ model:
                 containers: ['branch85_w7', 'power_law', 'exponential']
                 +branch85_w7: ['w7_time_0', 'w7_density_coefficient']
                 _branch85_w7: []
-                _exponential: ['time_0','rho_0']
-                _power_law: []
                 _power_law: ['time_0', 'rho_0', 'v_0']
                 _exponential: ['time_0', 'rho_0', 'v_0', 'exponent']
 
-            time_0:
-                property_type: quantity
-                default: 19.9999584 s
-                mandatory: False
-                help: This needs no change - DO NOT TOUCH
-
             w7_time_0:
                 property_type: quantity
                 default: 19.9999584 s
                 mandatory: False
                 help: This needs no change - DO NOT TOUCH
 
-            rho_0:
-                property_type: quantity
-                default: 6.e-10 g/cm^3
-                mandatory: False
-                help: This needs no change - DO NOT TOUCH
-
             w7_density_coefficient:
                 property_type: float
                 default: 3e29