From 97224ebfa95d782e59f8af66dcd41837a3ad409a Mon Sep 17 00:00:00 2001
From: NeirouzB <neirouz.bouchaira@ecl21.ec-lyon.fr>
Date: Sun, 5 Jan 2025 10:02:21 +0100
Subject: [PATCH] change stash
---
donnees/Question 7.ipynb | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/donnees/Question 7.ipynb b/donnees/Question 7.ipynb
index 3633434..a6c9c07 100644
--- a/donnees/Question 7.ipynb
+++ b/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
}
--
GitLab