Rebased and fixed merge conflicts.

LightBender · Dec 14, 2012 · bbb496b · bbb496b
1 parent a640f8f
commit bbb496b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/src/root/root.h b/src/root/root.h
@@ -236,8 +236,6 @@ struct OutBuffer : Object
 
     int doindent, level, linehead;
 
-    int doindent, level, linehead;
-
     OutBuffer();
     ~OutBuffer();
     char *extractData();

diff --git a/src/statement.c b/src/statement.c
@@ -2860,17 +2860,9 @@ void IfStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
         if (!elsebody->isScopeStatement())
             buf->level++;
         elsebody->toCBuffer(buf, hgs);
-<<<<<<< HEAD
-        if (!elsebody->isScopeStatement())
-            buf->level--;
-    }
-||||||| merged common ancestors
-    }
-=======
          if (!elsebody->isScopeStatement())
             buf->level--;
    }
->>>>>>> Initial DI generation improvements.
 }
 
 /******************************** ConditionalStatement ***************************/
@@ -3134,23 +3126,11 @@ void PragmaStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
         buf->writenl();
         buf->writeByte('{');
         buf->writenl();
-<<<<<<< HEAD
         buf->level++;
 
-||||||| merged common ancestors
-
-=======
-        buf->level++;
->>>>>>> Initial DI generation improvements.
         body->toCBuffer(buf, hgs);
-<<<<<<< HEAD
-
-        buf->level--;
-||||||| merged common ancestors
 
-=======
         buf->level--;
->>>>>>> Initial DI generation improvements.
         buf->writeByte('}');
         buf->writenl();
     }