change stash

donnees/Question 7.ipynb

@@ -2,7 +2,11 @@
  "cells": [
   {
    "cell_type": "code",
+<<<<<<< Updated upstream
    "execution_count": 12,
+=======
+   "execution_count": 1,
+>>>>>>> Stashed changes
    "metadata": {},
    "outputs": [
     {
@@ -22,6 +26,7 @@
     "# Create a cursor object\n",
     "cursor = conn.cursor()\n",
     "\n",
+<<<<<<< Updated upstream
     "print(\"Connected to company.db\")\n"
    ]
   },
@@ -391,6 +396,10 @@
    "metadata": {},
    "outputs": [],
    "source": []
+=======
+    "print(\"Connected to company.db\")"
+   ]
+>>>>>>> Stashed changes
   }
  ],
  "metadata": {
@@ -413,5 +422,9 @@
   }
  },
  "nbformat": 4,
+<<<<<<< Updated upstream
  "nbformat_minor": 4
+=======
+ "nbformat_minor": 2
+>>>>>>> Stashed changes
 }