Merge branch 'master' of https://gitlab.uv.es/camonan/formacion

Divergencias sugiere pull

Merge branch 'master' of https://gitlab.uv.es/camonan/formacion
Divergencias sugiere pull
67335cc0 · root · a4121b19 · 84c25f70 · 67335cc0 · 67335cc0
Commit 67335cc0 authored Jun 05, 2018 by root
8 changed files
--- a/FMDTARJE.cbl
+++ b/FMDTARJE.cbl
--- a/acalero.txt
+++ b/acalero.txt
--- a/carmenLorca.txt
+++ b/carmenLorca.txt
+Carmen Lorca
\ No newline at end of file
--- a/charly.txt
+++ b/charly.txt
+Hola Charly
--- a/documentomj.txt
+++ b/documentomj.txt
--- a/garpau4.txt
+++ b/garpau4.txt
+Victor Garcia Pau - 2018/06/05 10:46
+Modificado alas 11:44
\ No newline at end of file
--- a/jfo.txt
+++ b/jfo.txt
 codigo generado, Julio
+segunda linea de codigo
--- a/pedroGarcia.txt
+++ b/pedroGarcia.txt
 ###
 Hola soy Peter;
+SEgunda linea
 ####
\ No newline at end of file