Fix merge conflict

This commit is contained in:
E.Alamo
2018-05-27 16:26:02 +02:00
parent f44cbe23b9
commit 4952d7bd3c

View File

@ -13,7 +13,7 @@ namespace Da\User\Migration;
use yii\db\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() public function safeUp()
{ {