fix git conflicts

amahi · Jun 26, 2014 · b257197 · b257197
1 parent 10f2c4b
commit b257197
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 122 deletions.
diff --git a/app/views/disks_info/index.html.slim b/app/views/disks_info/index.html.slim
diff --git a/app/views/disks_info/mounts.html.erb b/app/views/disks_info/mounts.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -0,0 +1,4 @@
+DisksInfo::Engine.routes.draw do
+	# root of the plugin
+	root :to => 'disks_info#index'
+end