Fix conflics after rebase

This commit is contained in:
iagirre
2018-02-13 15:33:18 +01:00
parent 01f421717d
commit b8cc10d218
14 changed files with 176 additions and 17 deletions

View File

@@ -186,6 +186,7 @@ en:
table_feasibility: "Feasibility"
table_valuation_finished: "Val. Fin."
table_selection: "Selected"
table_evaluation: "Show to valuators"
table_incompatible: "Incompatible"
show:
assigned_admin: Assigned administrator

View File

@@ -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