diff options
| author | Marc Delisle <marc@infomarc.info> | 2014-01-15 17:53:00 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2014-01-15 17:53:00 +0400 |
| commit | 379f8b6704154aaca0ad8768e6dfb7295fd81918 (patch) | |
| tree | 2a4557a0cb0e38c7ed75986ec6092fd89f8e4151 /libraries/config.values.php | |
| parent | f2a7359f1b8dfd13d27c7f37c13d51e4808c835a (diff) | |
| parent | 144e00e5da92712336cb7d1370ffe830ffe5c58f (diff) | |
Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'libraries/config.values.php')
| -rw-r--r-- | libraries/config.values.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/config.values.php b/libraries/config.values.php index 485bfa42f6..33285614b9 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -158,7 +158,7 @@ $cfg_db['Export']['format'] = array( 'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml', 'yaml' ); -$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2'); +$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip'); $cfg_db['Export']['charset'] = array_merge( array(''), $GLOBALS['cfg']['AvailableCharsets'] |