diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /actionpack/examples/views | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'actionpack/examples/views')
| -rw-r--r-- | actionpack/examples/views/layouts/alt.html.erb | 1 | ||||
| -rw-r--r-- | actionpack/examples/views/layouts/kaigi.html.erb | 1 | ||||
| -rw-r--r-- | actionpack/examples/views/template.html.erb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/examples/views/layouts/alt.html.erb b/actionpack/examples/views/layouts/alt.html.erb new file mode 100644 index 0000000000..c4816337a6 --- /dev/null +++ b/actionpack/examples/views/layouts/alt.html.erb @@ -0,0 +1 @@ ++ <%= yield %> +
\ No newline at end of file diff --git a/actionpack/examples/views/layouts/kaigi.html.erb b/actionpack/examples/views/layouts/kaigi.html.erb new file mode 100644 index 0000000000..274607a96a --- /dev/null +++ b/actionpack/examples/views/layouts/kaigi.html.erb @@ -0,0 +1 @@ +Hello <%= yield %> Goodbye
\ No newline at end of file diff --git a/actionpack/examples/views/template.html.erb b/actionpack/examples/views/template.html.erb new file mode 100644 index 0000000000..3108e9ad70 --- /dev/null +++ b/actionpack/examples/views/template.html.erb @@ -0,0 +1 @@ +Hello <%= @name %>
\ No newline at end of file |