Skip to content

Commit

Permalink
Merge pull request #15 from manijain/master
Browse files Browse the repository at this point in the history
gemfile is updated.
  • Loading branch information
manijain committed Apr 20, 2012
2 parents 80ec746 + ffdc915 commit b1e524c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -5,7 +5,7 @@ gem 'rails', '3.2.3'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'sqlite3'
gem 'mysql'


# Gems used only for assets and not required
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Expand Up @@ -6,7 +6,7 @@
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
</head>
<body>hello rails
<body>Hello Rails

<%= yield %>

Expand Down

0 comments on commit b1e524c

Please sign in to comment.