move dict file to original translation branch

silvinabt87 · humitos · commit 4ede4bc97124 · 2020-07-05T21:36:44.000+02:00
diff --git a/dict b/dict
@@ -610,7 +610,14 @@ retrocompatible
 remuestreo
 request
 reubicar
+<<<<<<< HEAD
+<<<<<<< HEAD
 rmtree
+=======
+>>>>>>> f4c8de1915f4fbaae9cfbac68b363194dff61de4
+=======
+rmtree
+>>>>>>> 0e91f5ec14fb942a7267fcd51aab50f58a3c6356
 root
 run
 s
