Skip to content
Browse files

merge conflict fixed

  • Loading branch information...
2 parents 8ff78ba + a4708bf commit 55fd4edf4f851476ea68c81b6b0ca65d74c89648 @vidushee1awasthi vidushee1awasthi committed
Showing with 9 additions and 1 deletion.
  1. +8 −0 app/helpers/application_helper.rb
  2. +1 −1 doc/README_FOR_APP
View
8 app/helpers/application_helper.rb
@@ -1,5 +1,13 @@
module ApplicationHelper
def english
puts "Mango"
+
+ def title(page_name)
+ if page_name != nil
+ title_name == page_name
+ else
+ title_name = "ruby on Rails "
+ end
end
end
+end
View
2 doc/README_FOR_APP
@@ -1,2 +1,2 @@
-"I am doing some change in this"
+"I am doing some change in this line"
Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

0 comments on commit 55fd4ed

Please sign in to comment.
Something went wrong with that request. Please try again.