xtras/mathuaerknedam 55:4c614f8c5b12: Fixing unresolved conflict...

[commits at adium.im]

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/4c614f8c5b12
revision:	55:4c614f8c5b12
author:		mathuaerknedam
date:		Mon Jun 22 16:27:45 2009 -0500

Fixing unresolved conflict pointed out by boredzo.

diffs (15 lines):

diff -r 91f5e71304cf -r 4c614f8c5b12 SO3e.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/SO3e.AdiumMessageStyle/Contents/Resources/Mockup.html	Mon Jun 22 10:22:55 2009 -0500
+++ b/SO3e.AdiumMessageStyle/Contents/Resources/Mockup.html	Mon Jun 22 16:27:45 2009 -0500
@@ -7,11 +7,7 @@
 	</title>
 
 	<style type="text/css">
-<<<<<<< local
-		@import url( "./Variants/Time-Icon.css" );
-=======
 		@import url( "./Variants/Alternating.css" );
->>>>>>> other
 
 		body
 		{