Skip to content

Commit

Permalink
resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
popenc committed Aug 4, 2022
2 parents d07a626 + 5e24ce6 commit 256cfac
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cyan_angular/src/assets/default-env.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"disableMarkers": false,
"disableWaterbodyStats": false,
"appName": "",
"gtag": "",
}
"gtag": ""
}

0 comments on commit 256cfac

Please sign in to comment.