diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-20 17:14:10 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-20 17:14:10 +0100 |
| commit | ae35c4f2b94e37c871ec144ca83c93f215ac6b26 (patch) | |
| tree | 73bfe1c808b48c966c3a1b4161f626bb705dbdbf /zend/includes.h | |
| parent | f7ab1cd465cba96635b79281efef4790edc38a1a (diff) | |
| parent | 5235f87126cc2bca3907daada9f59e0c7c7bc834 (diff) | |
resolved 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 d013774..e4dd6b9 100644 --- a/zend/includes.h +++ b/zend/includes.h @@ -46,6 +46,7 @@ /** * Include other files from this library */ +#include "../include/version.h" #include "../include/inivalue.h" #include "../include/ini.h" #include "../include/exception.h" |