From 525fae4ec5423432de802abac063cc8dc4934303 Mon Sep 17 00:00:00 2001
From: fogus <mefogus@gmail.com>
Date: Tue, 21 Dec 2010 14:19:05 -0500
Subject: [PATCH] merging in minor changes.  bumped the version number

---
 project.clj               |  8 ++------
 src/marginalia/core.clj   | 13 -------------
 test/cljojo/test/core.clj |  6 ------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 test/cljojo/test/core.clj

diff --git a/project.clj b/project.clj
index a02bede..0d4b376 100644
--- a/project.clj
+++ b/project.clj
@@ -1,9 +1,5 @@
-(defproject marginalia "0.0.1"
-<<<<<<< HEAD
-  :description "lightweight literate programming for clojure -- inspired by docco"
-=======
-  :description "A port of [Docco](http://jashkenas.github.com/docco/) to Clojure."
->>>>>>> 98b945524be561829eee56c4eeaa3ee6a072f6f9
+(defproject marginalia "0.1.0"
+  :description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
   :dependencies
     [[org.clojure/clojure "1.2.0"]
      [org.clojars.nakkaya/markdownj "1.0.2b4"]
diff --git a/src/marginalia/core.clj b/src/marginalia/core.clj
index a849514..a32cafb 100644
--- a/src/marginalia/core.clj
+++ b/src/marginalia/core.clj
@@ -1,17 +1,10 @@
 (ns marginalia.core
-<<<<<<< HEAD
-  (:require [clojure.java.io :as io]
-            [clojure.string  :as str])
-  (:use [marginalia.aux :only [*css* *html*]]))
-=======
   "**Core** provides all of the functionality around parsing clojure source files
    into an easily consumable format."
   (:require [clojure.java.io :as io]
             [clojure.string  :as str])
   (:use [marginalia.html :only (uberdoc-html)]
         [clojure.contrib.find-namespaces :only (read-file-ns-decl)]))
->>>>>>> 98b945524be561829eee56c4eeaa3ee6a072f6f9
-
 
 (def *test* "./src/cljojo/core.clj")
 (def *docs* "docs")
@@ -150,17 +143,11 @@
                (inc dnum)
                (conj sections {:docs-text (str (str/replace line *comment* "")) :line (+ cnum (dec dnum))}))
         (recur more
-<<<<<<< HEAD
-               (+ dnum cnum)
-               1
-               (conj sections {:code-text (str line) :line cnum})))
-=======
                (inc cnum)
                0
                (if (docstring-line? (str line) sections)
                  (conj sections {:docstring-text (str line) :line cnum})
                  (conj sections {:code-text (str line) :line cnum}))))
->>>>>>> 98b945524be561829eee56c4eeaa3ee6a072f6f9
       sections)))
 
 
diff --git a/test/cljojo/test/core.clj b/test/cljojo/test/core.clj
deleted file mode 100644
index 46c1773..0000000
--- a/test/cljojo/test/core.clj
+++ /dev/null
@@ -1,6 +0,0 @@
-(ns cljojo.test.core
-  (:use [cljojo.core] :reload)
-  (:use [clojure.test]))
-
-(deftest replace-me ;; FIXME: write
-  (is false "No tests have been written."))