diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-12-03 08:53:54 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-12-03 08:53:54 +0000 |
| commit | 228fb9b59ea7328f34c799835ae6dd9310a49f25 (patch) | |
| tree | 193cacdb23726b2c22d3ad49db1daf3a0c92cab0 /nextstep | |
| parent | a3abb176e3bfefb260a3c422f5bffc37e74400f0 (diff) | |
| download | emacs-228fb9b59ea7328f34c799835ae6dd9310a49f25.tar.gz | |
Revert previous accidental commit.
Diffstat (limited to 'nextstep')
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | 4 |
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 |