aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/new_base/views/with_both_layouts/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/new_base/views/with_both_layouts/layouts')
-rw-r--r--actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb1
-rw-r--r--actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb1
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb b/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb
deleted file mode 100644
index 25f839fded..0000000000
--- a/actionpack/test/new_base/views/with_both_layouts/layouts/application.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-OHAI <%= yield %> KTHXBAI \ No newline at end of file
diff --git a/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb b/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb
deleted file mode 100644
index 43d89fde52..0000000000
--- a/actionpack/test/new_base/views/with_both_layouts/layouts/happy_path/render_action_with_controller_layout_first.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-With Controller Layout! <%= yield %> KTHXBAI \ No newline at end of file