From 50f7a15fb5355ed49205d0897921296475de3e52 Mon Sep 17 00:00:00 2001
From: Chris Buttery <chris.buttery@newism.com.au>
Date: Sat, 17 Mar 2012 18:21:06 +1100
Subject: [PATCH] removed text-align property

I removed this so people could just control this themselves.
What if someone added 358px, how would you align the text then?
It was a case of trying to be too smart
---
 stylesheets/stitch/patterns/images/_inline-icon.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/stylesheets/stitch/patterns/images/_inline-icon.scss b/stylesheets/stitch/patterns/images/_inline-icon.scss
index 56afe0c..0f64b0e 100644
--- a/stylesheets/stitch/patterns/images/_inline-icon.scss
+++ b/stylesheets/stitch/patterns/images/_inline-icon.scss
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* 
 	Add an icon to an inline element. E.g anchor or span
 	Pass through an asset, and optionally a padding value, x-position and y-position.
@@ -16,5 +15,4 @@
    background-repeat: no-repeat; 
    line-height:image-height($img);
    padding-#{$x-pos}:image-width($img) + $spacing;
-   text-align: $x-pos; 
 }
\ No newline at end of file