Guarda cambios antes de traerse upstream
Solución hasta el momento
merge cambios a parseLine
Merge branch 'master' into sol-german
Merge remote-tracking branch 'origin/master' into sol-german
Solución por ahora
solución candidata
Merge remote-tracking branch 'origin/master' into sol-german
reusa parseFile
Merge remote-tracking branch 'upstream/master' into sol-german
Merge pull request #9 from gerferra/sol-german

Solución @gerferra