[pLog-svn] r5601 - plog/trunk/class/action/admin

[mark at devel.lifetype.net]

Author: mark
Date: 2007-07-02 03:29:02 -0400 (Mon, 02 Jul 2007)
New Revision: 5601

Modified:
   plog/trunk/class/action/admin/adminaddarticlecategoryajaxaction.class.php
Log:
Cleanup the svn conflict mark.

Modified: plog/trunk/class/action/admin/adminaddarticlecategoryajaxaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddarticlecategoryajaxaction.class.php	2007-07-02 07:10:19 UTC (rev 5600)
+++ plog/trunk/class/action/admin/adminaddarticlecategoryajaxaction.class.php	2007-07-02 07:29:02 UTC (rev 5601)
@@ -43,12 +43,7 @@
             $this->_categoryInMainPage = 1;
 			$this->_categoryDescription = $this->_categoryName;
 			$this->_properties = "";	
->>>>>>> .merge-right.r5367
 
-<<<<<<< .working
-			$this->registerFieldValidator( "categoryName", new StringValidator());
-			$this->setValidationErrorView( $this->getErrorView( $this->_locale->tr("error_adding_article_category" )));
-=======
             if( empty($this->_categoryName) || $this->_categoryName == "" ) {
 	            $this->_view = new AdminXmlView( $this->_blogInfo, "response" );				
 	            $this->_view->setValue( "method", "addCategoryAjax" );
@@ -58,7 +53,6 @@
             }
 
             return true;
->>>>>>> .merge-right.r5367
         }
 
         /**