From ca831701b2dbc0c1e6a74db394ef4ff7e5ca167f Mon Sep 17 00:00:00 2001
From: John Stennett <john00ivy@gmail.com>
Date: Thu, 7 Dec 2017 23:54:35 +0200
Subject: [PATCH] MQE-592: Test Case Audit

- Removing git message in the MinimumTestCest XML.
---
 .../Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
index 440a14c9603..e9c971f7e10 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/MinimumTestCest.xml
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-- 
GitLab