# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1259830434 0
# Node ID b537bb8db7d99b480a439c079178377908883372
# Parent  afe271b2ef407e7a5ba1b72685cc64f6336651b1
Revert previous accidental commit.

diff -r afe271b2ef40 -r b537bb8db7d9 nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Thu Dec 03 08:53:06 2009 +0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Thu Dec 03 08:53:54 2009 +0000
@@ -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