check

antolonappan · Aug 30, 2023 · 6c18cfa · 6c18cfa
1 parent 8dfe4f0
commit 6c18cfa
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/Notebooks/likelihood.ipynb b/Notebooks/likelihood.ipynb
@@ -1,5 +1,28 @@
 {
+<<<<<<< HEAD
    "cells": [
+=======
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 47,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "import sys\n",
+    "sys.path.append('../')\n",
+    "import time\n",
+    "%matplotlib inline"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 48,
+   "metadata": {},
+   "outputs": [
+>>>>>>> f36dbea (check)
     {
      "cell_type": "code",
      "execution_count": 5,