Merge branch 'categories'

Conflicts: toto.gemspec
willmcneilly · Aug 14, 2011 · 35f4176 · 35f4176
2 parents 0250c0c + d047eb1
commit 35f4176
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/toto.gemspec b/toto.gemspec
@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
     "lib/toto.rb",
     "test/articles/1900-05-17-the-wonderful-wizard-of-oz.txt",
     "test/articles/2001-01-01-two-thousand-and-one.txt",
-    "test/articles/2009-04-01-tilt-factor.txt",
     "test/articles/2009-12-04-some-random-article.txt",
-    "test/articles/2009-12-11-the-dichotomy-of-design.txt",
+    "test/articles/cat/2009-12-11-the-dichotomy-of-design.txt",
+    "test/articles/cat/dog/2009-04-01-tilt-factor.txt",
     "test/autotest.rb",
     "test/templates/about.rhtml",
     "test/templates/archives.rhtml",