From 08f57f13b2512a6995452fa33aab30b12a79ede8 Mon Sep 17 00:00:00 2001
From: gschwab <g.schwab@triagens.de>
Date: Wed, 4 Jun 2014 17:21:15 +0200
Subject: [PATCH] Revert "tabs replaced with spaces"

This reverts commit f38493e4c678b06dcb09b3f1fc918ba6bb8c367e.

Conflicts:
	Documentation/Books/Makefile
	Documentation/Books/Users/SUMMARY.md
	Documentation/Books/Users/localtheme/templates/includes/book/header.html
---
 Documentation/Books/Users/SUMMARY.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Documentation/Books/Users/SUMMARY.md b/Documentation/Books/Users/SUMMARY.md
index c2d6903a8e..52c138ef68 100644
--- a/Documentation/Books/Users/SUMMARY.md
+++ b/Documentation/Books/Users/SUMMARY.md
@@ -1,7 +1,6 @@
 # Summary
 <!-- 1 -->
 * [Installing](Installing/README.md)
-<<<<<<< HEAD
   * [Linux](Installing/Linux.md)
   * [Mac OS X](Installing/MacOSX.md)
   * [Windows](Installing/Windows.md)