diff options
| author | Azul <azul@leap.se> | 2013-01-22 16:23:48 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-22 16:24:27 +0100 |
| commit | 493dea794285f0874a9235fe14e4350bd53c2a9f (patch) | |
| tree | be2485d9d9dc4b91efbc2a45f19e7c2fb63531b7 /users/app/views | |
| parent | 31d18779fe1af0c55b72be7bc554302322025ee5 (diff) | |
removed accidentaily commited files
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/emails/_email.html.haml.orig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/users/app/views/emails/_email.html.haml.orig b/users/app/views/emails/_email.html.haml.orig deleted file mode 100644 index 440870d..0000000 --- a/users/app/views/emails/_email.html.haml.orig +++ /dev/null @@ -1,12 +0,0 @@ -<<<<<<< HEAD -%li.pull-right - %code= email - - if params[:action] == 'edit' -======= -= wrapped(email, local_assigns) do - = email - - if local_assigns[:with].try(:include?, :delete) ->>>>>>> more flexible email partial - = link_to(user_email_alias_path(@user, email), :method => :delete) do - %i.icon-remove -.clearfix |