fix

hesedel · May 7, 2014 · 2db07e7 · 2db07e7
1 parent e2c6edd
commit 2db07e7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/protected/models/Item.php b/protected/models/Item.php
@@ -56,16 +56,10 @@ public function rules()
 			// The following rule is used by search().
 			// @todo Please remove those attributes that should not be searched.
 			array('id, created, updated, title, price, description, category_id, location_id, condition_id, user_id', 'safe', 'on'=>'search'),
-<<<<<<< HEAD
 			array('images', 'file', 'allowEmpty'=>true, 'types'=>'gif, jpg, jpeg, png', 'minSize'=>16*1024, 'maxSize'=>3*(1024*1024), 'maxFiles'=>5), // minSize 16KB, maxSize 3MB
 			array('photo', 'file', 'allowEmpty'=>true, 'types'=>'gif, jpg, jpeg, png', 'minSize'=>16*1024, 'maxSize'=>3*(1024*1024), 'maxFiles'=>1), // minSize 16KB, maxSize 3MB
 			array('images, photo', 'ImageValidator', 'allowEmpty'=>true),
 			array('title, description', 'BadWord'),
-=======
-			array('images', 'file', 'allowEmpty'=>true, 'types'=>'gif, jpg, jpeg, png', 'safe'=>true, 'minSize'=>16*1024, 'maxSize'=>3*(1024*1024), 'maxFiles'=>5), // minSize 16KB, maxSize 3MB
-			array('photo', 'file', 'allowEmpty'=>true, 'types'=>'gif, jpg, jpeg, png', 'safe'=>true, 'minSize'=>16*1024, 'maxSize'=>3*(1024*1024), 'maxFiles'=>1), // minSize 16KB, maxSize 3MB
-			array('images, photo', 'ImageValidator', 'allowEmpty'=>true, 'safe'=>true),
->>>>>>> origin/master
 		);
 	}