summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2016-05-27 17:05:15 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2016-05-27 17:05:15 +0200
commitdd142d29c860cb0c39ec30b25db6a8313310a09e (patch)
tree41526af43eefba7d6d41e9050a331307addeec2a
parent2a4c37a2a536e6d7b67ebe2ffe4d4f6a8fd1b42a (diff)
parente94cf8ea0e342f41837c4685a45c4d2af488fe6e (diff)
downloadcoderay-dd142d29c860cb0c39ec30b25db6a8313310a09e.tar.gz
Fixed merge
-rw-r--r--FOLDERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/FOLDERS b/FOLDERS
index 1709d08..9eae35e 100644
--- a/FOLDERS
+++ b/FOLDERS
@@ -29,7 +29,6 @@ Run them as functional tests with <code>rake test:demos</code>.
Some additional files for CodeRay, mainly graphics and Vim scripts.
-
== lib - CodeRay library code
This is the base directory for the CodeRay library.