commit 1 y 2

commit 3
ingadhoc · Sep 15, 2022 · 871ae03 · 871ae03
1 parent eac89b0
commit 871ae03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/l10n_ar_ux/__init__.py b/l10n_ar_ux/__init__.py
@@ -1,6 +1,10 @@
 ##############################################################################
 # For copyright and license notices, see __manifest__.py file in module root
+<<<<<<< HEAD
 # directoryytyrtyrty
+=======
+# directoryy
+>>>>>>> 4a62114... commit 2
 ##############################################################################
 from . import controllers
 from . import models

diff --git a/l10n_ar_ux/__manifest__.py b/l10n_ar_ux/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'Argentinian Accounting UX',
+    'name': 'Argentinian Accounting UX UX',
     'version': "15.0.1.8.0",
     'category': 'Localization/Argentina',
     'sequence': 14,