merge commit

2022-08-01 14:11:37 -07:00
parent cabc775f58 f515ac4f52
commit 630ab1f4f4
3 changed files with 15 additions and 0 deletions
--- a/packages/hoppscotch-data/src/environment.ts
+++ b/packages/hoppscotch-data/src/environment.ts
@@ -12,6 +12,7 @@ export type Environment = {
 export type Variables = {
  key: string
  value: string
+<<<<<<< HEAD
 <<<<<<< HEAD
  }[]

@@ -24,6 +25,12 @@ const REGEX_PATHVAR = /{{([^>]*)}}/g // "{{myVariable}}"
 const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
 const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
 >>>>>>> origin/codeday/main
+=======
+}[]
+
+const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
+const REGEX_PATH_VAR = /{{([^>]*)}}/g // "{{myVariable}}"
+>>>>>>> origin/codeday/jason

 /**
 * How much times can we expand environment variables