1 files changed, 1 insertions, 3 deletions

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index f18751d2379..5934dedb611 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,8 +1,6 @@
+/* Localized versions of Info.plist keys */
 
-<<<<<<< InfoPlist.strings
-=======
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "Version 23.1.50";
 CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc.";
->>>>>>> 1.7