From 4952d7bd3c79d9a5d7e0facfc92f4701283df546 Mon Sep 17 00:00:00 2001
From: "E.Alamo" <erosdelalamo@gmail.com>
Date: Sun, 27 May 2018 16:26:02 +0200
Subject: [PATCH] Fix merge conflict

---
 src/User/Migration/m000000_000009_add_gdpr_consent_fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php
index 573f316..ea8c47c 100644
--- a/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php
+++ b/src/User/Migration/m000000_000009_add_gdpr_consent_fields.php
@@ -13,7 +13,7 @@ namespace Da\User\Migration;
 
 use yii\db\Migration;
 
-class m000000_000007_add_gdpr_consent_fields extends Migration
+class m000000_000009_add_gdpr_consent_fields extends Migration
 {
     public function safeUp()
     {