Permalink
Browse files

fix merge conflict

  • Loading branch information...
2 parents 8fb73c2 + 3515d83 commit 69b077c8e5fb997e799455e242e0b593e8e37e1e Ryan Cook committed Jan 12, 2011
Showing with 8 additions and 8 deletions.
  1. +5 −5 Gemfile.lock
  2. +1 −1 lib/regulate/version.rb
  3. +2 −2 regulate.gemspec
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- regulate (0.0.1)
+ regulate (0.1.0)
abstract_auth (~> 0.1.3)
grit (~> 2.3.0)
rails (~> 3.0.0)
@@ -50,10 +50,10 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.2)
- celerity (0.8.6)
+ celerity (0.8.7)
childprocess (0.1.6)
ffi (~> 0.6.3)
- culerity (0.2.13)
+ culerity (0.2.14)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
@@ -64,7 +64,7 @@ GEM
mime-types (~> 1.15)
i18n (0.5.0)
json_pure (1.4.6)
- mail (2.2.13)
+ mail (2.2.14)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -103,7 +103,7 @@ GEM
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.23)
- xpath (0.1.2)
+ xpath (0.1.3)
nokogiri (~> 1.3)
yard (0.6.4)
View
@@ -1,4 +1,4 @@
module Regulate
# Our gem version
- VERSION = "0.0.1"
+ VERSION = "0.1.0"
end
View
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
s.authors = ["Collin Schaafsma", "Ryan Cook"]
s.email = ["collin@quickleft.com", "ryan@quickleft.com"]
s.homepage = ""
- s.summary = %q{The CMS we always wanted.}
- s.description = %q{The CMS we always wanted.}
+ s.summary = %q{Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.}
+ s.description = %q{Rails 3 engine that provides a Git backed CMS that allows for an admin to define editable regions in a page view.}
s.rubyforge_project = "regulate"

0 comments on commit 69b077c

Please sign in to comment.