From: Glenn Morris <rgm@gnu.org>
Date: Thu, 3 Dec 2009 08:53:54 +0000 (+0000)
Subject: Revert previous accidental commit.
X-Git-Tag: emacs-pretest-23.1.90~105
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=228fb9b59ea7328f34c799835ae6dd9310a49f25;p=emacs.git

Revert previous accidental commit.
---

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