archive checkbox

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -7,6 +7,11 @@ class ArchiveFile
 
   PAYMENT_TYPES = @site_valid_locales
   
+<<<<<<< HEAD
+=======
+  PAYMENT_TYPES = @site_valid_locales
+  
+>>>>>>> archive checkbox
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   
   has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
@@ -21,7 +26,7 @@ class ArchiveFile
   belongs_to :archive_file_category
 
   has_many :archive_file_multiples, :autosave => true, :dependent => :destroy
-  
+
   accepts_nested_attributes_for :archive_file_multiples, :allow_destroy => true
   
   validates_presence_of :title

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -111,9 +111,7 @@
 			</div>
 			
 			
-			
-			
-
+		
 		</div>
 	
 <!--Post End-->