2 files changed, 0 insertions, 59 deletions
diff --git a/users/app/helpers/users_helper.rb.orig b/users/app/helpers/users_helper.rb.orig
deleted file mode 100644
index ed027d3..0000000
--- a/users/app/helpers/users_helper.rb.orig
+++ /dev/null
@@ -1,47 +0,0 @@
-module UsersHelper
-
-  def user_form_with(partial, options = {})
-    user_form(options) do |f|
-      options[:f] = f
-      render :partial => partial,
-        :layout => 'legend_and_submit',
-        :locals => options
-    end
-  end
-
-  def user_form(options = {})
-    simple_form_for @user,
-      :html => user_form_html_options(options),
-      :validate => true do |f|
-      yield f
-    end
-  end
-
-  def user_form_html_options(options)
-    { :class => user_form_html_classes(options).join(" "),
-      :id => dom_id(@user, options[:legend])
-    }
-  end
-
-  def user_form_html_classes(options)
-    classes = %W/form-horizontal user form/
-    classes << options[:legend]
-    classes << (@user.new_record? ? 'new' : 'edit')
-    classes.compact
-  end
-
-<<<<<<< HEAD
-  def user_field(field)
-    value = @user.send(field)
-    value = value.to_s(:long) if field.end_with? '_at'
-    value || 'not set'
-=======
-  def wrapped(item, options = {})
-    options[:as] ||= :div
-    content_tag options[:as], :class => dom_class(item), :id => dom_id(item) do
-      yield
-    end
->>>>>>> more flexible email partial
-  end
-
-end
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