diff options
| author | Jan Kaluza <jkaluza@redhat.com> | 2013-10-24 12:30:13 +0200 |
|---|---|---|
| committer | Jan Kaluza <jkaluza@redhat.com> | 2013-10-24 12:30:13 +0200 |
| commit | f735ee187e9904fc42db2eb54b99bc4f82ef610f (patch) | |
| tree | 304ec1c627324ed8b37e2fdfc9d23746400b8b6b /00-base.conf | |
| parent | b3f304619b84e409ed109bd6fc4cad3c4fcf03d6 (diff) | |
| parent | aa55b1c6dd6d51e5fdee1cdeca7e90fa04c66f29 (diff) | |
| download | httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.tar.gz httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.tar.xz httpd-f735ee187e9904fc42db2eb54b99bc4f82ef610f.zip | |
Fix merge conflicts
Diffstat (limited to '00-base.conf')
| -rw-r--r-- | 00-base.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/00-base.conf b/00-base.conf index 31d979f..4242d12 100644 --- a/00-base.conf +++ b/00-base.conf @@ -40,6 +40,7 @@ LoadModule include_module modules/mod_include.so LoadModule info_module modules/mod_info.so LoadModule log_config_module modules/mod_log_config.so LoadModule logio_module modules/mod_logio.so +LoadModule macro_module modules/mod_macro.so LoadModule mime_magic_module modules/mod_mime_magic.so LoadModule mime_module modules/mod_mime.so LoadModule negotiation_module modules/mod_negotiation.so |