From fc92d362981a80fff779a94d21cca3bcce2f917d Mon Sep 17 00:00:00 2001 From: Fabrizzio Date: Mon, 17 Jun 2019 09:40:48 -0500 Subject: [PATCH 1/2] prueba para hacer un pull --- prueba_git.py | 2 ++ prueba_git.py~ | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 prueba_git.py~ diff --git a/prueba_git.py b/prueba_git.py index 5cd20b7..31cf2d9 100644 --- a/prueba_git.py +++ b/prueba_git.py @@ -1,2 +1,4 @@ def _init() function mkasdkfmmmfd + + this will make a pull diff --git a/prueba_git.py~ b/prueba_git.py~ new file mode 100644 index 0000000..5cd20b7 --- /dev/null +++ b/prueba_git.py~ @@ -0,0 +1,2 @@ +def _init() + function mkasdkfmmmfd From 4827ed88fa2687c3587345130e0cbc143b3761a5 Mon Sep 17 00:00:00 2001 From: Fabrizzio Date: Mon, 17 Jun 2019 09:42:48 -0500 Subject: [PATCH 2/2] making this my try for a pull request in another branch --- prueba_git.py | 2 ++ prueba_git.py~ | 2 ++ 2 files changed, 4 insertions(+) diff --git a/prueba_git.py b/prueba_git.py index 31cf2d9..8a58ba4 100644 --- a/prueba_git.py +++ b/prueba_git.py @@ -1,4 +1,6 @@ def _init() function mkasdkfmmmfd + +ksksksasdd this will make a pull diff --git a/prueba_git.py~ b/prueba_git.py~ index 5cd20b7..31cf2d9 100644 --- a/prueba_git.py~ +++ b/prueba_git.py~ @@ -1,2 +1,4 @@ def _init() function mkasdkfmmmfd + + this will make a pull