Merge remote-tracking branch 'origin/staging'

2021-05-27 16:07:05 +02:00
parent d4af93a44a 2b2d931187
commit 6915b831cf
1 changed files with 5 additions and 0 deletions
--- a/client/src/modules/config.ts
+++ b/client/src/modules/config.ts
@@ -3,8 +3,13 @@ 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: {