Ex1

Project.ipynb

@@ -26,7 +26,8 @@
     "ax.plot(t, s)\n",
     "\n",
     "ax.set(xlabel='time (s)', ylabel='voltage (mV)',\n",
-    "       title='The simplest plot in the world')\n",
+    "       title='This plot is simple!')\n",
+
     "ax.grid()"
    ]
   }

README.md

@@ -1,3 +1,5 @@
+MERGED EX1
+
 # GitExercise_Conflicts
 
 This exercise assumes you are using the COGS 108 Datahub setup.  But you can do everything here using your own computer if you set it up with the same tools (which is recent Jupyterlab with the git extension built on nbdime). If you are using git command line or VSCode, or something else entirely then you can still do this exercise, but the step by step insructions will need to be adapted to your tools.  There is always more than one way to get something done, just learn and use the tool that you prefer!