Mercurial > emacs

changeset 106389:b537bb8db7d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert previous accidental commit.
author Glenn Morris <rgm@gnu.org>
date Thu, 03 Dec 2009 08:53:54 +0000
parents afe271b2ef40
children 4eee659fa954
files nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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