merge conflict resolution

freiburgermsu · Aug 26, 2024 · 937829d · 937829d
2 parents f7ca721 + 35d3a40
commit 937829d
Show file tree

Hide file tree

Showing 15 changed files with 2,735,244 additions and 5,709 deletions.
diff --git a/examples/Community Modeling/MSSteadyCom/MSCommunity_thermo-Copy1.ipynb b/examples/Community Modeling/MSSteadyCom/MSCommunity_thermo-Copy1.ipynb
diff --git a/examples/Community Modeling/MSSteadyCom/MSCommunity_thermo.ipynb b/examples/Community Modeling/MSSteadyCom/MSCommunity_thermo.ipynb
@@ -631,7 +631,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.10.6"
   }
  },
  "nbformat": 4,