Cleanup in inventory reports after merge.

[fa-stable.git] / reporting / rep304.php

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 723859669c45879b87456aa8176af2063ff50020..a3a87daefbdd25d584b11c98c19662c8704fbade 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -33,7 +33,7 @@ function getTransactions($category, $location, $fromcust, $from, $to, $show_serv
 {
        $from = date2sql($from);
        $to = date2sql($to);
-<<<<<<< HEAD
+
        $sql = "SELECT item.category_id,
                        category.description AS cat_description,
                        item.stock_id,