some

Author: sivasathyaseeelan

benchmarks/HybridJumps/Synapse.jmd

@@ -1729,15 +1729,9 @@ function J_synapse(p_synapse::SynapseParams, nu)
             @j_jump(96, p_synapse, nu, GABA_r_ro1 * p.xd[47]), # 96
             @j_jump(97, p_synapse, nu, GABA_r_c1 * p.xd[49]), # 97
             @j_jump(98, p_synapse, nu, GABA_r_ro2 * p.xd[48]), # 98
-<<<<<<< HEAD
-            @j_jump(99, p_synapse, nu, GABA_r_c2 * p.xd[50]) # 99
-        ],
-        variable_jumps = [
-=======
             @j_jump(99, p_synapse, nu, GABA_r_c2 * p.xd[50]), # 99
         ),
         variable_jumps = (
->>>>>>> e7531a7f (Direct() for Synapse methord)
             # R-type VGCC
             @j_jump(56,
                 p_synapse,
@@ -1868,13 +1862,8 @@ function J_synapse(p_synapse::SynapseParams, nu)
             @j_jump(76, p_synapse, nu, p.xd[36] * D_rate, 1, typemax(Float64)), # 76
             @j_jump(77, p_synapse, nu, p.xd[37] * P_rate, 1, typemax(Float64)), # 77
             @j_jump(78, p_synapse, nu, p.xd[36] * P_rate, 1, typemax(Float64)), # 78
-<<<<<<< HEAD
-            @j_jump(79, p_synapse, nu, p.xd[38] * D_rate, 1, typemax(Float64)) # 79
-        ]
-=======
             @j_jump(79, p_synapse, nu, p.xd[38] * D_rate, 1, typemax(Float64)), # 79
         ),
->>>>>>> e7531a7f (Direct() for Synapse methord)
     )
 
     return jumps