From 1c241e17fe807f9876950731a834f502d3b87804 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 14 Sep 2014 14:29:35 +0200
Subject: nimweb compiles again

---
 tools/nimweb.nim | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index c6602d884..8744a250e 100644
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
@@ -300,14 +300,9 @@ proc buildPdfDoc(c: var TConfigData, destPath: string) =
 
 proc buildAddDoc(c: var TConfigData, destPath: string) =
   # build additional documentation (without the index):
-<<<<<<< HEAD
   var commands = newSeq[string](c.webdoc.len)
   for i, doc in pairs(c.webdoc):
-    commands[i] = "nimrod doc $# --docSeeSrcUrl:$# -o:$# $#" %
-=======
-  for d in items(c.webdoc):
-    exec("nim doc $# --docSeeSrcUrl:$# -o:$# $#" %
->>>>>>> 0047172274a73c681f619f5cd60aaad7109f694d
+    commands[i] = "nim doc $# --docSeeSrcUrl:$# -o:$# $#" %
       [c.nimrodArgs, c.gitCommit,
       destPath / changeFileExt(splitFile(doc).name, "html"), doc]
   mexec(commands, c.numProcessors)
-- 
cgit 1.4.1-2-gfad0