Fixed merge

jwillemsen · jwillemsen · commit dd142d29c860 · 2016-05-27T17:05:15.000+02:00
diff --git 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.
