Fetch upstream, merge conflicts

CBroz1 · Nov 21, 2023 · a02425e · a02425e
2 parents 495fca9 + b684336
commit a02425e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docs/src/misc/index.md b/docs/src/misc/index.md
@@ -2,8 +2,8 @@
 
 This folder contains miscellaneous supporting files documentation.
 
-- [Database Management.md](./database_management.md)
-- [figurl Views.md](./figurl_views.md)
-- [insert Data.md](./insert_data.md)
-- [Merge Tables.md](./merge_tables.md)
-- [Session Groups.md](./session_groups.md)
+- [Database Management](./database_management.md)
+- [figurl Views](./figurl_views.md)
+- [insert Data](./insert_data.md)
+- [Merge Tables](./merge_tables.md)
+- [Session Groups](./session_groups.md)
diff --git a/notebooks/py_scripts/00_Setup.py b/notebooks/py_scripts/00_Setup.py
@@ -244,6 +244,7 @@
 
 # +
 import os
+
 import datajoint as dj
 
 if os.path.basename(os.getcwd()) == "notebooks":
-Original file line number
+Diff line change
@@ Expand Up / @@ -244,6 +244,7 @@ @@
     # +
     import os
     import datajoint as dj
     if os.path.basename(os.getcwd()) == "notebooks":
@@ Expand Down @@