From 493dea794285f0874a9235fe14e4350bd53c2a9f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 22 Jan 2013 16:23:48 +0100
Subject: removed accidentaily commited files

---
 users/app/views/emails/_email.html.haml.orig | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 users/app/views/emails/_email.html.haml.orig

(limited to 'users/app/views')

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
-- 
cgit v1.2.3