Resolve merge conflicts

Giveth · Feb 7, 2024 · 83c2312 · 83c2312
2 parents 8fbb1a9 + 6865e41
commit 83c2312
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/migration/1707045732631-modify_recurring_donation_table.ts b/migration/1707045732631-modify_recurring_donation_table.ts
@@ -9,8 +9,8 @@ export class ModifyRecurringDonationTable1707045732631
             ALTER TABLE recurring_donation
             ADD COLUMN IF NOT EXISTS amount INT NOT NULL DEFAULT 0,
             ADD COLUMN IF NOT EXISTS interval text NOT NULL DEFAULT 'monthly',
-            ADD COLUMN IF NOT EXISTS currency text NOT NULL DEFAULT 'USD'
-            ADD COLUMN IF NOT EXISTS status text NOT NULL DEFAULT 'pending'
+            ADD COLUMN IF NOT EXISTS currency text NOT NULL DEFAULT 'USD',
+            ADD COLUMN IF NOT EXISTS status text NOT NULL DEFAULT 'pending';
         `);
   }
 
@@ -21,7 +21,7 @@ export class ModifyRecurringDonationTable1707045732631
             DROP COLUMN amount,
             DROP COLUMN status,
             DROP COLUMN interval,
-            DROP COLUMN currency
+            DROP COLUMN currency;
         `);
   }
 }