changed branch to master after resolving conflict

2021-05-27 16:14:28 +02:00
parent 6915b831cf
commit 493cd6852f
1 changed files with 0 additions and 5 deletions
--- 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: {