Created
July 16, 2018 13:41
-
-
Save delevaa/f6d3915b258f38418ece2d2712a73148 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --cc src/zen_configurator/loaders/yaml/default.yaml | |
| index d7dbb92,a174c9f..0000000 | |
| --- a/src/zen_configurator/loaders/yaml/default.yaml | |
| +++ b/src/zen_configurator/loaders/yaml/default.yaml | |
| @@@ -165,7 -157,7 +165,11 @@@ settings | |
| DO_LOGGING: true | |
| HOST: 0.0.0.0 | |
| MAX_INSTANCES: '3' # Front-end API request batching | |
| ++<<<<<<< HEAD | |
| + VERSION: v3.0-DEV | |
| ++======= | |
| + VERSION: v2.20.1-RC7 | |
| ++>>>>>>> release/v2.20.1 | |
| FULLTEXT_INDEXER: ggrc.fulltext.mysql.MysqlIndexer | |
| ## DataDog APM Settings ## |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment