dynamicslab · Jacob-Stevens-Haas · Jan 11, 2022 · Feb 14, 2022 · Feb 15, 2022 · Feb 20, 2022
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,13 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
+<<<<<<< HEAD
         python-version: ["3.8", "3.10"]
+||||||| 5c6e9fd
+        python-version: [3.7, 3.8]
+=======
+        python-version: [3.7, 3.8, 3.9]
+>>>>>>> origin/trapping_extended
 
     steps:
     - uses: actions/checkout@v3

diff --git a/examples/8_trapping_sindy_examples/dysts_examples.ipynb b/examples/8_trapping_sindy_examples/dysts_examples.ipynb
diff --git a/examples/8_trapping_sindy_examples/trapping_extended.ipynb b/examples/8_trapping_sindy_examples/trapping_extended.ipynb
diff --git a/examples/8_trapping_sindy_examples/trapping_sindy_paper_examples.ipynb b/examples/8_trapping_sindy_examples/trapping_sindy_paper_examples.ipynb