[Emacs-diffs] emacs/nextstep/Cocoa/Emacs.base/Contents/Resour...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/12/03 08:53:54

Modified files:
        nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: 
                                                                    
InfoPlist.strings 

Log message:
        Revert previous accidental commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings?cvsroot=emacs&r1=1.12&r2=1.13

Patches:
Index: InfoPlist.strings
===================================================================
RCS file: 
/sources/emacs/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- InfoPlist.strings   24 Nov 2009 15:31:06 -0000      1.12
+++ InfoPlist.strings   3 Dec 2009 08:53:54 -0000       1.13
@@ -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