merchant

commit adac1f3773dc318c23ee49ff29c95ccdc67dc51f
parent 4f070c63034224197f070c009e5b29b11fcc87e7
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Mon, 28 Apr 2025 14:58:43 +0200

adding fixed Makefile.am

Diffstat:
M
src/backenddb/Makefile.am
 | 
4
+---

1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
@@ -33,10 +33,8 @@ sql_DATA = \
   merchant-0014.sql \
   merchant-0015.sql \
   merchant-0016.sql \
-<<<<<<< HEAD
-=======
   merchant-0017.sql \
->>>>>>> master
+  merchant-0018.sql \
   drop.sql
 
 BUILT_SOURCES = \