From 793d35e3a57ac15a5d90d10eb7be54699b1eba1e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 4 Jul 2016 16:03:38 +0530
Subject: [PATCH] rebuild docs.css

---
 frappe/public/css/docs.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css
index 1ad5b7e920..1f91e89944 100644
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
@@ -236,10 +236,6 @@ body {
 }
 .toggle-sidebar {
   margin-right: 15px;
-<<<<<<< HEAD
-=======
-  border-color: #fff;
->>>>>>> 08ff129... added dropdown, disabled offcanvas in portal
 }
 .navbar-default .navbar-nav > li > a,
 .navbar-default .navbar-brand {