fix dict file

silvinabt87 · silvinabt87 · commit 7e94639dcaea · 2020-06-20T12:40:36.000-03:00
diff --git a/dict b/dict
@@ -334,18 +334,12 @@ iterador
 iteradores
 j
 json
-<<<<<<< HEAD
-<<<<<<< HEAD
 kernel
 KiB
-=======
->>>>>>> f4c8de1915f4fbaae9cfbac68b363194dff61de4
-=======
 kernel
 KiB
->>>>>>> 0e91f5ec14fb942a7267fcd51aab50f58a3c6356
-Latin
-latin
+Latín
+latín
 l
 letter
 lexicográfica
@@ -485,14 +479,7 @@ reordenar
 repr
 request
 reubicar
-<<<<<<< HEAD
-<<<<<<< HEAD
 rmtree
-=======
->>>>>>> f4c8de1915f4fbaae9cfbac68b363194dff61de4
-=======
-rmtree
->>>>>>> 0e91f5ec14fb942a7267fcd51aab50f58a3c6356
 root
 run
 s
@@ -510,16 +497,8 @@ serialización
 serializados
 serializar
 shell
-<<<<<<< HEAD
-<<<<<<< HEAD
-shutil
-=======
-shells
->>>>>>> f4c8de1915f4fbaae9cfbac68b363194dff61de4
-=======
 shutil
 shells
->>>>>>> 0e91f5ec14fb942a7267fcd51aab50f58a3c6356
 sincronización
 singleton
 singletons
