Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8095)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8096)
@@ -510,5 +510,5 @@
 				
 			 	$this->doDownload($_REQUEST['r_id']);
-<<<<<<< .mine
+
 			} else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'getMultiRechnung') {
 		
@@ -516,14 +516,6 @@
 			
 				$this->doDownload($_REQUEST['r_id']);
-=======
-			} 
-			else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'getMultiRechnung') {
-
-				\check_admin_referer('wpsg-mod_invoice-order_ajax-getMultiRechnung-'.wpsg_getInt($_REQUEST['r_id']));
-			
-				$this->doDownload($_REQUEST['r_id']);
->>>>>>> .theirs								
-			}
-			else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'storno') {
+
+			} else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'storno') {
 				
 				\check_admin_referer('wpsg-mod_invoice-order_ajax-storno-'.wpsg_getInt($_REQUEST['edit_id']));