Merge branch 'MGComponent' into hmlli/MGComponent

hmlli · hmlli · commit 3b1de9448a4d · 2022-09-01T11:04:11.000-07:00
diff --git a/crystal_toolkit/renderables/migration_graph.py b/crystal_toolkit/renderables/migration_graph.py
@@ -1 +1,4 @@
+<<<<<<< Updated upstream
 # initiation of file for [WIP] PR
+=======
+>>>>>>> Stashed changes
