Fixing phalcon header [ci skip]

phalcon · phalcon · commit fa74578cdd9a · 2012-10-31T22:29:30.000-05:00
diff --git a/build/php_phalcon.h b/build/php_phalcon.h
@@ -22,11 +22,7 @@
 
 #define PHALCON_RELEASE 1
 
-<<<<<<< HEAD
 #define PHP_PHALCON_VERSION "0.6.0"
-=======
-#define PHP_PHALCON_VERSION "0.5.2"
->>>>>>> master
 #define PHP_PHALCON_EXTNAME "phalcon"
 
 #define PHALCON_MAX_MEMORY_STACK 48
