From cd9cec13b469ab5dee4b635122c7ece30102bd6f Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Fri, 23 Oct 2015 23:25:40 -0700
Subject: [PATCH] Merge.

---
 idea-plug-in/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/idea-plug-in/index.html b/idea-plug-in/index.html
index 6b01b53..3ff46a8 100644
--- a/idea-plug-in/index.html
+++ b/idea-plug-in/index.html
@@ -147,8 +147,6 @@ dependencies {
           <p align="center">
               <img src="../pics/show-log.png" class="img-rounded"/>
           </p>
-
->>>>>>> IDEA plug-in doc.
       </div>
 
       <!-- Table of contents -->