Resolving merge conflict for CoastalDist branch.

jkibele · May 23, 2018 · 43b2ff0 · 43b2ff0
2 parents 3dbb563 + 736bf1f
commit 43b2ff0
Show file tree

Hide file tree

Showing 16 changed files with 6,424 additions and 79 deletions.
diff --git a/notebooks/DetectingNetworkBreaks.ipynb b/notebooks/DetectingNetworkBreaks.ipynb
@@ -1111,7 +1111,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.13"
+   "version": "2.7.12"
   }
  },
  "nbformat": 4,