Merge branch '2.0.x' of https://github.com/phalcon/cphalcon into 2.0.x

chuganghong · May 16, 2016 · 01eb195 · 01eb195
2 parents c749b80 + efe49ef
commit 01eb195
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/phalcon/mvc/model.zep b/phalcon/mvc/model.zep
@@ -497,7 +497,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
 	 *));
 	 *</code>
 	 *
-	 * @param \Phalcon\Mvc\ModelInterface|Phalcon\Mvc\Model\Row base
+	 * @param \Phalcon\Mvc\ModelInterface|\Phalcon\Mvc\Model\Row base
 	 * @param array data
 	 * @param array columnMap
 	 * @param int dirtyState