diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-26 13:08:39 +0200 |
| commit | f526c4c7a7ada1ab534ca0976c7b66718b9a5660 (patch) | |
| tree | 68b4db309ee00d3b7ebc1743b4825057b3db7f28 /zend/includes.h | |
| parent | a286c34777e48d59410e7511f52f4a6f08000ba3 (diff) | |
| parent | 97bc6757346d394a4b7d5898983be298e0b0ea98 (diff) | |
fixed conflict
Diffstat (limited to 'zend/includes.h')
| -rw-r--r-- | zend/includes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/zend/includes.h b/zend/includes.h index cabb096..63b435e 100644 --- a/zend/includes.h +++ b/zend/includes.h @@ -48,6 +48,7 @@ #include "../include/inivalue.h" #include "../include/ini.h" #include "../include/exception.h" +#include "../include/fatalerror.h" #include "../include/streams.h" #include "../include/type.h" #include "../include/hashparent.h" |