move dict file to original translation branch

silvinabt87 · silvinabt87 · commit f9fb4d1c3f71 · 2020-06-20T12:58:15.000-03:00
diff --git a/dict b/dict
@@ -479,7 +479,14 @@ reordenar
 repr
 request
 reubicar
+<<<<<<< HEAD
+<<<<<<< HEAD
 rmtree
+=======
+>>>>>>> f4c8de1915f4fbaae9cfbac68b363194dff61de4
+=======
+rmtree
+>>>>>>> 0e91f5ec14fb942a7267fcd51aab50f58a3c6356
 root
 run
 s
