zino/seatmapv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse Source
This commit is contained in:
zino
2021-05-27 16:07:05 +02:00
parent d4af93a44a 2b2d931187
commit 6915b831cf
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/modules/config.ts
View File

@@ -3,8 +3,13 @@ import * as I from "../types/types";
export const config: I.Config = { export const config: I.Config = {
childHasVenueXML: false, childHasVenueXML: false,
debug: true, debug: true,
<<<<<<< HEAD
branch: "master", branch: "master",
version: "0.0.1", version: "0.0.1",
=======
branch: "staging",
version: "0.2.0",
>>>>>>> origin/staging
maxSelectedSeats: 10, maxSelectedSeats: 10,
resources: { resources: {
master: { master: {