Fix conflics after rebase

2018-02-13 15:33:18 +01:00
parent 01f421717d
commit b8cc10d218
14 changed files with 176 additions and 17 deletions
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -186,6 +186,7 @@ es:
        table_feasibility: "Viabilidad"
        table_valuation_finished: "Ev. Fin."
        table_selection: "Seleccionado"
+        table_evaluation: "Mostrar a evaluadores"
        table_incompatible: "Incompatible"
      show:
        assigned_admin: Administrador asignado