From 493cd6852fa1940c07d894422a5162880632eb74 Mon Sep 17 00:00:00 2001
From: zino <zino@zinomedia.de>
Date: Thu, 27 May 2021 16:14:28 +0200
Subject: [PATCH] changed branch to master after resolving conflict

---
 client/src/modules/config.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/src/modules/config.ts b/client/src/modules/config.ts
index cb7cbda..09754de 100644
--- a/client/src/modules/config.ts
+++ b/client/src/modules/config.ts
@@ -3,13 +3,8 @@ import * as I from "../types/types";
 export const config: I.Config = {
     childHasVenueXML: false,
     debug: true,
-<<<<<<< HEAD
     branch: "master",
-    version: "0.0.1",
-=======
-    branch: "staging",
     version: "0.2.0",
->>>>>>> origin/staging
     maxSelectedSeats: 10,
     resources: {
         master: {