Skip to content

tap1012
tap1012
Commit ee35fc97 authored by Carlos David García Hernández's avatar Carlos David García Hernández
Browse files
Options

regresando a master

parent 4c5fa9f6
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
03-POO.ipynb
View file @ ee35fc97
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 14, "execution_count": 2,
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 26, "execution_count": 5,
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 32, "execution_count": 6,
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [
{ {
...@@ -208,14 +208,14 @@ ...@@ -208,14 +208,14 @@
"'canine'" "'canine'"
] ]
}, },
"execution_count": 32, "execution_count": 6,
"metadata": {}, "metadata": {},
"output_type": "execute_result" "output_type": "execute_result"
} }
], ],
"source": [ "source": [
"Max = Dog(\"Max\")\n", "Maxi = Dog(\"Maxi\")\n",
"Max.get_kind()\n" "Maxi.get_kind()\n"
] ]
}, },
{ {
...@@ -475,11 +475,7 @@ ...@@ -475,11 +475,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
<<<<<<< HEAD
"version": "3.5.2" "version": "3.5.2"
=======
"version": "3.5.3"
>>>>>>> master
} }
}, },
"nbformat": 4, "nbformat": 4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment