[fix] Merge migrations

vpn/migrations/0003_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vpn', '0002_auto_20170802_2021'),
+        ('vpn', '0002_vpnconfiguration_crypto_link'),
+    ]
+
+    operations = [
+    ]