diff options
| author | mr <mr@mrautenberg.de> | 2011-10-17 15:36:46 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-10-17 15:36:46 +0200 |
| commit | 32a6b36b7286171f99b64df3ec8e8a5e5c8d0695 (patch) | |
| tree | 1a52dc83d139c1b0048d73c2fa58a8e0d02f9111 | |
| parent | f731bb2accac02535739a97ea368fa99c9b9ea3f (diff) | |
| parent | fc6d98de8462f8c7e3db3f15cd0ed85b70f51c5f (diff) | |
Merge branch 'development' into lazar-gui
| -rw-r--r-- | views/create.haml | 2 | ||||
| -rw-r--r-- | views/create_echa.haml (renamed from views/model_echa.haml) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/views/create.haml b/views/create.haml index a26ae05..9b0ca09 100644 --- a/views/create.haml +++ b/views/create.haml @@ -52,7 +52,7 @@ format: %input{:type => 'file', :name => 'file', :id => 'file', :size => '41'} %br - = haml :model_echa, :layout => false + = haml :create_echa, :layout => false %br %input{ :type => "submit", :value => "Create model"} =# link_to "Cancel", '/create' diff --git a/views/model_echa.haml b/views/create_echa.haml index 4815c35..4815c35 100644 --- a/views/model_echa.haml +++ b/views/create_echa.haml |