A technical correction for the file access_url_edit.php

main/admin/access_url_edit.php

@@ -1,10 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
-==============================================================================
-*	@package chamilo.admin
-==============================================================================
-*/
+ *	@package chamilo.admin
+ */
 
 $language_file = 'admin';
 $cidReset = true;
@@ -79,20 +78,13 @@ $form->addElement('text','url',get_lang('URL'),array('size'=>'30'));
 $form->addRule('url', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('url', '', 'maxlength',254);
 $form->addElement('textarea','description',get_lang('Description'));
-<<<<<<< /www/chamilodev.beeznest.com/www/main/admin/access_url_edit.php
-
-if ($_GET['url_id'] != 1) {
-$form->addElement('checkbox','active',get_lang('Active'));
-}
-
-//$form->addRule('checkbox', get_lang('ThisFieldIsRequired'), 'required');
-=======
 
 //the first url with id = 1 will be always active
 if ($_GET['url_id'] != 1) {
 	$form->addElement('checkbox','active',get_lang('Active'));
 }
->>>>>>> /tmp/access_url_edit.php~other.zY-an1
+
+//$form->addRule('checkbox', get_lang('ThisFieldIsRequired'), 'required');
 
 $defaults['url']='http://';
 $form->setDefaults($defaults);
@@ -130,4 +122,3 @@ if (isset ($_GET['action'])) {
 // Submit button
 $form->addElement('submit', 'submit', $submit_name);
 $form->display();
-?>