summaryrefslogtreecommitdiff
path: root/users/app/views/emails
diff options
context:
space:
mode:
Diffstat (limited to 'users/app/views/emails')
-rw-r--r--users/app/views/emails/_email.html.haml.orig12
1 files changed, 12 insertions, 0 deletions
diff --git a/users/app/views/emails/_email.html.haml.orig b/users/app/views/emails/_email.html.haml.orig
new file mode 100644
index 0000000..440870d
--- /dev/null
+++ b/users/app/views/emails/_email.html.haml.orig
@@ -0,0 +1,12 @@
+<<<<<<< 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