From 2269daf95e66fb82904e07c1ce148782ebddea3c Mon Sep 17 00:00:00 2001 From: Dan Lipert Date: Wed, 28 Oct 2020 20:00:31 +0900 Subject: [PATCH] fix conflicting migrations --- ...ddress.py => 0159_profile_last_observed_payout_address.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename app/dashboard/migrations/{0158_profile_last_observed_payout_address.py => 0159_profile_last_observed_payout_address.py} (71%) diff --git a/app/dashboard/migrations/0158_profile_last_observed_payout_address.py b/app/dashboard/migrations/0159_profile_last_observed_payout_address.py similarity index 71% rename from app/dashboard/migrations/0158_profile_last_observed_payout_address.py rename to app/dashboard/migrations/0159_profile_last_observed_payout_address.py index 4f80a216962..0d494a956a1 100644 --- a/app/dashboard/migrations/0158_profile_last_observed_payout_address.py +++ b/app/dashboard/migrations/0159_profile_last_observed_payout_address.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.4 on 2020-10-27 20:36 +# Generated by Django 2.2.4 on 2020-10-28 11:00 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('dashboard', '0157_auto_20201016_2225'), + ('dashboard', '0158_profile_anonymize_gitcoin_grants_contributions_help'), ] operations = [