added ProximoSemestre in master branch, no supe como hacer el merge

server/CompanionApp/migrations/0012_proxiosemestre.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.0.8 on 2020-12-07 14:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0011_auto_20201207_0948'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProxioSemestre',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=150)),
+                ('code', models.CharField(max_length=9)),
+                ('creditos', models.IntegerField(default=0)),
+                ('section', models.CharField(blank=True, max_length=5, null=True)),
+                ('prof', models.CharField(blank=True, max_length=150, null=True)),
+                ('hours', models.CharField(blank=True, max_length=150, null=True)),
+                ('days', models.CharField(blank=True, max_length=100, null=True)),
+                ('rooms', models.CharField(blank=True, max_length=100, null=True)),
+                ('course_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.Curso')),
+            ],
+        ),
+    ]

server/CompanionApp/models.py

@@ -34,3 +34,13 @@ class Matricula(models.Model):
     dias =models.CharField(max_length=100,blank=True, null=True) 
 
 
+class ProxioSemestre(models.Model):
+    course_id = models.ForeignKey(Curso, on_delete=models.CASCADE, default=1)
+    name = models.CharField(max_length=150)
+    code = models.CharField(max_length=9)
+    creditos = models.IntegerField(default=0)
+    section = models.CharField(max_length=5, null=True, blank=True)
+    prof = models.CharField(max_length=150, null=True, blank=True)
+    hours =models.CharField(max_length=150,blank=True, null=True) 
+    days =models.CharField(max_length=100,blank=True, null=True) 
+    rooms =models.CharField(max_length=100,blank=True, null=True)