complete rebase (whoops!)

RascalSoftware · Feb 17, 2025 · 0f2d1d8 · 0f2d1d8
1 parent d30d284
commit 0f2d1d8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,16 +13,13 @@ build/
 source/.buildinfo
 source/*.inv
 source/_outputs/
-<<<<<<< HEAD
 
 # direnv
 .envrc
 
 # autogenerated documentation
 source/reference/python/RATapi.*
-=======
 source/python_examples/data/
 source/matlab_examples/*.html
 source/python_examples/notebooks/*
 !source/python_examples/notebooks/README.md
->>>>>>> 7177e682 (removed python-rat data from repo)