From bde4587c7615250f31c70eee07893b52973ebee0 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Tue, 12 Nov 2024 19:10:10 +0100 Subject: [PATCH] fix: resolve git conflict in cebolla_izq --- gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc index 03ceec45..585055b5 100644 --- a/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc +++ b/gymkhana/rooms/turno_cocina/despensa/esc/cebolla_izq.esc @@ -3,4 +3,4 @@ say player "Cebollas!" :action2 say player "mmm, no!" -say player "no me gusta la cebolla." \ No newline at end of file +say player "no me gusta la cebolla."