diff --git a/ejercicio2.ipynb b/ejercicio2.ipynb
index 42601adb20f63af1b2776b030bd2f5d4977f733b..94d183dce508829200ccc3d4bdbe015969993b58 100644
--- a/ejercicio2.ipynb
+++ b/ejercicio2.ipynb
@@ -1,44 +1,5 @@
 {
  "cells": [
-  {
-   "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 36,
-=======
-   "execution_count": 1,
->>>>>>> 596658e793ac6ed4703fb04095a9df8c6b9cf156
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-<<<<<<< HEAD
-       "'\\n@author: jennifer\\n\\nEste programa entrega los números de una fila del\\ntriángulo de Pascal.\\n'"
-      ]
-     },
-     "execution_count": 36,
-=======
-       "'\\nCreated on Wed Feb  3 09:47:54 2021\\n\\n@author: jennifer\\n\\nEste programa crea una lista de palabras separadas por guiones\\n'"
-      ]
-     },
-     "execution_count": 1,
->>>>>>> 596658e793ac6ed4703fb04095a9df8c6b9cf156
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "#!/usr/bin/env python3\n",
-    "# -*- coding: utf-8 -*-\n",
-    "\"\"\"\n",
-<<<<<<< HEAD
-    "@author: jennifer\n",
-    "\n",
-    "Este programa entrega los números de una fila del\n",
-    "triángulo de Pascal.\n",
-    "\"\"\"\n"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},