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 /include/classbase.h | |
| parent | a286c34777e48d59410e7511f52f4a6f08000ba3 (diff) | |
| parent | 97bc6757346d394a4b7d5898983be298e0b0ea98 (diff) | |
fixed conflict
Diffstat (limited to 'include/classbase.h')
| -rw-r--r-- | include/classbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/classbase.h b/include/classbase.h index a736c4e..9f0bac3 100644 --- a/include/classbase.h +++ b/include/classbase.h @@ -2,9 +2,9 @@ * ClassBase.h * * This is the base class of the "Class" class. This is an internal class that - * is used by the PHP-CPP library. But because the constructor is protected, + * is used by the PHP-CPP library. Because the constructor is protected, * you can not create any instances if this class yourself (and you are not - * supposed to do that either. + * supposed to do that either). * * Further more, because this base class is a 'private' base of Class, all * features of it are normally also inaccessible. |