From 89a14480e676fc43a4c27e83532d0badfa600e03 Mon Sep 17 00:00:00 2001
From: Krzysztof Dymkowski <kdymkowski84@gmail.com>
Date: Tue, 24 Jan 2017 14:16:02 +0000
Subject: [PATCH] Remove git diff '>>>>>' comment.

---
 docs/source/release/v3.9.0/indirect_inelastic.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/release/v3.9.0/indirect_inelastic.rst b/docs/source/release/v3.9.0/indirect_inelastic.rst
index 6300310a120..d12c7432818 100644
--- a/docs/source/release/v3.9.0/indirect_inelastic.rst
+++ b/docs/source/release/v3.9.0/indirect_inelastic.rst
@@ -17,7 +17,6 @@ Algorithms
 - A new algorithm :ref:`Abins <algm-Abins>`  which allows comparison of theoretical and experimental INS.
 - A 'QuickRun' algorithm :ref:`SofQWMomentsScan <algm-SofQWMomentsScan>` that reduces data and runs through :ref:`SofQW <algm-SofQW>` and :ref:`SofQWMoments <algm-SofQWMoments>`.
 
->>>>>>> upstream/master
 Data Reduction
 ##############
 
-- 
GitLab