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
5fc778c5 · Roberto Guijarro · 94db93f8 · 6ef0e1e2 · 5fc778c5
Commit 5fc778c5 authored Sep 23, 2020 by Roberto Guijarro
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test.txt test.txt +4 -2

No files found.
--- a/test.txt
+++ b/test.txt
 hola que tal
 cuentame alo

-hola
\ No newline at end of file
+
+hola
+
+cuarta linea