resolving conflicts

IDAES · May 23, 2024 · 9dd2bf4 · 9dd2bf4
2 parents 8e35271 + 8818ba7
commit 9dd2bf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg b/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg
diff --git a/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb b/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
@@ -5623,5 +5623,8 @@
  "nbformat_minor": 5
 =======
  "nbformat_minor": 3
+<<<<<<< HEAD:idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
+>>>>>>> 8818ba74788937addd589a9b2aedb1a0139f0ad7:idaes_examples/notebooks/active/power_gen/ngcc/ngcc_doc.ipynb
+=======
 >>>>>>> 8818ba74788937addd589a9b2aedb1a0139f0ad7:idaes_examples/notebooks/active/power_gen/ngcc/ngcc_doc.ipynb
 }