From ea513d534a12bbe21747ce304e30f8b8d83bbb21 Mon Sep 17 00:00:00 2001
From: Mark Moffat <mark@192-168-1-115.tpgi.com.au>
Date: Thu, 20 Jun 2019 12:47:08 +0930
Subject: [PATCH] Fixed rebase issue

---
 routes/product.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routes/product.js b/routes/product.js
index d58e61f..bf7560e 100644
--- a/routes/product.js
+++ b/routes/product.js
@@ -2,10 +2,7 @@ const express = require('express');
 const common = require('../lib/common');
 const { restrict, checkAccess } = require('../lib/auth');
 const { indexProducts } = require('../lib/indexing');
-<<<<<<< HEAD
 const { validateJson } = require('../lib/schema');
-=======
->>>>>>> 0972565124e88e2dc57744e72b8734ffc85d1532
 const colors = require('colors');
 const rimraf = require('rimraf');
 const fs = require('fs');