Merge branch 'master' of http://git.setisl.com/seti/git-testing

# Conflicts: # test.txt

Merge branch 'master' of http://git.setisl.com/seti/git-testing
# Conflicts: # test.txt
8cd1539d · Angello Torres · b14b27c3 · ceb8adc0 · 8cd1539d
Commit 8cd1539d authored Sep 23, 2020 by Angello Torres
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

test.txt test.txt +2 -3

No files found.
--- a/test.txt
+++ b/test.txt
 hola que tal
+cuentame alo
-estoy bien
\ No newline at end of file
\ No newline at end of file