changed branch to master after resolving conflict

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: {