adium-1.4 3277:40959126ec07: Fix the fixed fix fix fix fix

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/40959126ec07
revision:	3277:40959126ec07
author:		Evan Schoenberg
date:		Tue Nov 16 22:29:07 2010 -0600

Fix the fixed fix fix fix fix

diffs (15 lines):

diff -r 630cd8e9fc98 -r 40959126ec07 Plists/Info.plist
--- a/Plists/Info.plist	Tue Nov 16 20:09:29 2010 -0600
+++ b/Plists/Info.plist	Tue Nov 16 22:29:07 2010 -0600
@@ -469,11 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-<<<<<<< local
-	<string>1.4.1</string>
-=======
 	<string>1.4.2hg</string>
->>>>>>> other
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.8</string>
 	<key>LSRequiresNativeExecution</key>