From dadcc9580b2dfc021a663a838a86f66bf8e57851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergei=20Ts=C3=B5ganov?=
 <maricavor@Sergeis-MBP-2.wifi.tld.ee>
Date: Mon, 21 Mar 2022 09:49:29 +0200
Subject: [PATCH] Fixed structure.sql file

---
 db/structure.sql | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/db/structure.sql b/db/structure.sql
index f55203bb3..56d499289 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -5401,14 +5401,11 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20211126085139'),
 ('20211231113934'),
 ('20220106123143'),
-<<<<<<< HEAD
 ('20220113201642'),
 ('20220113220809'),
 ('20220124105717'),
 ('20220216113112'),
 ('20220228093211');
-=======
 ('20220316140727');
->>>>>>> f98598620 (Moved notifications about automatic contact name update to bulk change poll message)