From ee3a3eea8e7f33c8fe8096c57b924061563b3a78 Mon Sep 17 00:00:00 2001
From: anandpathak31 <anandpathak31@gmail.com>
Date: Wed, 18 Sep 2024 11:14:19 -0400
Subject: [PATCH] merge master

---
 src/blox/DBS_Model_Blox_Adam_Brown.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blox/DBS_Model_Blox_Adam_Brown.jl b/src/blox/DBS_Model_Blox_Adam_Brown.jl
index c9c3e829..b430130a 100644
--- a/src/blox/DBS_Model_Blox_Adam_Brown.jl
+++ b/src/blox/DBS_Model_Blox_Adam_Brown.jl
@@ -119,7 +119,7 @@ struct Striatum_MSN_Adam <: CompositeBlox
 
 end    
 
-struct Striatum_FSI_Adam  <: AbstractCompositeBlox
+struct Striatum_FSI_Adam  <: CompositeBlox
     namespace
     parts
     odesystem
@@ -202,7 +202,7 @@ struct Striatum_FSI_Adam  <: AbstractCompositeBlox
 
 end
 
-struct GPe_Adam <: AbstractCompositeBlox
+struct GPe_Adam <: CompositeBlox
     namespace
     parts
     odesystem