Resolved conflicts [ci skip]

1ukaz · Mar 9, 2017 · 240d914 · 240d914
1 parent 25ce504
commit 240d914
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/config.json b/config.json
@@ -6,6 +6,7 @@
         "constant-folding": true,
         "static-constant-class-folding": true
     },
+
     "namespace": "phalcon",
     "name": "phalcon",
     "description": "Web framework delivered as a C-extension for PHP",