Merge pull request #10600 from phalcon/column-patch-1

Fixed columns merge
phalcon · Jul 7, 2015 · e69843e · e69843e
2 parents 02e7b82 + 54fa817
commit e69843e
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/phalcon/db/column.zep b/phalcon/db/column.zep
@@ -97,7 +97,6 @@ class Column implements ColumnInterface
 	 *
 	 */
 	const TYPE_DOUBLE = 9;
-<<<<<<< HEAD
 
 	/**
 	 * Tinyblob abstract data type
@@ -134,10 +133,6 @@ class Column implements ColumnInterface
 	 */
 	const TYPE_JSONB = 16;
 
-=======
-
-
->>>>>>> master
 	/**
 	 * Bind Type Null
 	 */
@@ -329,7 +324,6 @@ class Column implements ColumnInterface
 		 * Check if the column has a decimal scale
 		 */
 		if fetch scale, definition["scale"] {
-<<<<<<< HEAD
 			switch type {
 
 				case self::TYPE_INTEGER:
@@ -342,12 +336,6 @@ class Column implements ColumnInterface
 
 				default:
 					throw new Exception("Column type does not support scale parameter");
-=======
-			if type == self::TYPE_INTEGER || type == self::TYPE_FLOAT || type == self::TYPE_DECIMAL || type == self::TYPE_DOUBLE {
-				let this->_scale = scale;
-			} else {
-				throw new Exception("Column type does not support scale parameter");
->>>>>>> master
 			}
 		}