[REF] i18n: Conflict on the daily cron
[REF] i18n: Conflict on the daily cron

On branch master
Your branch is up-to-date with 'origin/master'.
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   openacademy/i18n/es.po

no changes added to commit (use "git add" and/or "git commit -a")

JesusZapata/openacademy-project