Commits · 5fc778c52032722b719994cfc3a5e322da9bea65 · seti / git-testing · GitLab

23 Sep, 2020 7 commits
- Merge branch 'master' of http://git.setisl.com/seti/git-testing · 5fc778c5
```
# Conflicts:
#	test.txt
```
  Roberto Guijarro authored Sep 23, 2020
  5fc778c5 Browse Files
- prueba del cambio · 94db93f8
  Roberto Guijarro authored Sep 23, 2020
  
  94db93f8 Browse Files
- Nueva linea · 6ef0e1e2
  Angello Torres authored Sep 23, 2020
  
  6ef0e1e2 Browse Files
- Merge branch 'master' of http://git.setisl.com/seti/git-testing · 8cd1539d
```
# Conflicts:
#	test.txt
```
  Angello Torres authored Sep 23, 2020
  8cd1539d Browse Files
- contesta · ceb8adc0
  Roberto Guijarro authored Sep 23, 2020
  
  ceb8adc0 Browse Files
- segunda linea · b14b27c3
  Angello Torres authored Sep 23, 2020
  
  b14b27c3 Browse Files
- Fichero inicial de prueba · a7ad6347
  Roberto Guijarro authored Sep 23, 2020
  
  a7ad6347 Browse Files