From 86fe4156e8ce6ea1a7272974e3d56f491ea43270 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Wed, 14 Oct 2020 16:08:45 +0200
Subject: [PATCH] Conflicts fixed

---
 .../Squidex.Domain.Apps.Entities/Contents/BackupContents.cs  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs
index 4e5c00aa8..5ae25f21a 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/BackupContents.cs
@@ -77,14 +77,9 @@ namespace Squidex.Domain.Apps.Entities.Contents
         {
             switch (@event.Payload)
             {
-<<<<<<< HEAD
-                case ContentCreated contentCreated:
-                    contentIdsBySchemaId.GetOrAddNew(contentCreated.SchemaId.Id).Add(@event.Headers.AggregateId());
-=======
                 case AppCreated appCreated:
                     assetsUrlNew = GetUrls(appCreated.Name);
                     assetsUrlOld = await ReadUrlsAsync(context.Reader);
->>>>>>> release/4.x
                     break;
                 case SchemaDeleted schemaDeleted:
                     contentIdsBySchemaId.Remove(schemaDeleted.SchemaId.Id);