Add revised activity 1

zmuhls · Oct 2, 2024 · fe0d7d2 · fe0d7d2
1 parent 563e112
commit fe0d7d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 320 deletions.
diff --git a/activity_1.ipynb b/activity_1.ipynb
diff --git a/assets/activities/activity_1.ipynb b/assets/activities/activity_1.ipynb
@@ -2,25 +2,22 @@
   "cells": [
     {
       "cell_type": "markdown",
-<<<<<<< HEAD
-=======
       "metadata": {
         "id": "view-in-github",
         "colab_type": "text"
       },
       "source": [
-        "<a href=\"https://colab.research.google.com/github/zmuhls/ccny-data-science/blob/main/assets/activities/activity_1.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
+        "<a href=\"https://colab.research.google.com/github/zmuhls/ccny-data-science/blob/main/activity_1.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
       ]
     },
     {
       "cell_type": "markdown",
->>>>>>> 0e85e81b588b839e74dfce7278df6367b371e94e
       "id": "e06e8c55-6300-414a-b248-e610342edc6e",
       "metadata": {
         "id": "e06e8c55-6300-414a-b248-e610342edc6e"
       },
       "source": [
-        "# Programming Activity 1"
+        "# Activity 1"
       ]
     },
     {
@@ -159,11 +156,7 @@
         "id": "927c8101-95a3-4d1d-b6d9-d390b94b2ad9"
       },
       "source": [
-<<<<<<< HEAD
         "6. What data type is the variable ```age```? Declare the value and print the data type."
-=======
-        "6. What data type is the variable ```age```? Check the data type."
->>>>>>> 0e85e81b588b839e74dfce7278df6367b371e94e
       ]
     },
     {
@@ -183,11 +176,7 @@
         "id": "006b4e55-9d77-4007-86a5-e03408b737f1"
       },
       "source": [
-<<<<<<< HEAD
         "7. What happens when you add ```10``` to your ```name```? Please demonstrate it in the cell below and add an inline comment that provides a brief explanation of the result.  "
-=======
-        "7. What happens when you add ```10``` to your ```name```? Please demonstrate it in the cell below and provide a brief explanation for the result."
->>>>>>> 0e85e81b588b839e74dfce7278df6367b371e94e
       ]
     },
     {
@@ -202,27 +191,6 @@
     },
     {
       "cell_type": "markdown",
-<<<<<<< HEAD
-=======
-      "id": "68e0be42-6b1c-4133-ae1f-eac4e08de48d",
-      "metadata": {
-        "id": "68e0be42-6b1c-4133-ae1f-eac4e08de48d"
-      },
-      "source": [
-        "8. Explain the error below in your own words."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "id": "d2b9ec67-9689-4220-b8ad-7de01fb6ca33",
-      "metadata": {
-        "id": "d2b9ec67-9689-4220-b8ad-7de01fb6ca33"
-      },
-      "source": []
-    },
-    {
-      "cell_type": "markdown",
->>>>>>> 0e85e81b588b839e74dfce7278df6367b371e94e
       "source": [
         "8. Declare a variable that asks for user input, then print the variable storing their response as the output"
       ],
@@ -305,12 +273,8 @@
       "version": "3.11.5"
     },
     "colab": {
-<<<<<<< HEAD
-      "provenance": []
-=======
       "provenance": [],
       "include_colab_link": true
->>>>>>> 0e85e81b588b839e74dfce7278df6367b371e94e
     }
   },
   "nbformat": 4,