From 252de89ae0d62b2e26b2191fde0940d6d07c7367 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Date: Fri, 31 Oct 2014 12:24:48 -0700
Subject: [PATCH] Removed extra characters from make.bat

---
 python/docs/make.bat | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/docs/make.bat b/python/docs/make.bat
index da9fcbe5dd3af..eb70913bf8c14 100644
--- a/python/docs/make.bat
+++ b/python/docs/make.bat
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 @ECHO OFF
 
 REM Command file for Sphinx documentation