From 9df793347fdd91c00e774d510b3f5cdedc196292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sat, 9 Aug 2014 21:44:54 +0200
Subject: [PATCH] Fixed 2 syntax errors in config_coding.xml .

---
 src/xdocs/config_coding.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/xdocs/config_coding.xml b/src/xdocs/config_coding.xml
index 2a62191fd..42ab2a556 100644
--- a/src/xdocs/config_coding.xml
+++ b/src/xdocs/config_coding.xml
@@ -2486,7 +2486,6 @@ case 3:
       </subsection>
     </section>
 
-<<<<<<< HEAD
     <section name="VariableDeclarationUsageDistance">
       <subsection name="Description">
         <p>
@@ -2644,7 +2643,7 @@ cal.set(Calendar.MINUTE, minutes);
          </p>
          <source>
  int sum = 0;
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i &lt; 20; i++) {
      a++;
      b--;
      sum++;