Merge branch 'emily' into master

emyesme · web-flow · commit 63a80637c110 · 2020-04-28T13:08:59.000-05:00
diff --git a/back/upload/output.txt b/back/upload/output.txt
@@ -2,4 +2,4 @@
 Tiempo compartido: 5
 Costo: 450 
 ----------
-==========
+=======
diff --git a/back/upload/temp.dzn b/back/upload/temp.dzn
@@ -21,4 +21,5 @@ Evitar =[|Actor1, Actor2
 %Tiempo Compartido: 6
 %----------
 %==========
-%Finished in 140msec
+%Finished in 140msec
+
