diff options
| author | Travis Howell | 2003-08-28 12:23:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-28 12:23:35 +0000 |
| commit | b8d5342f34a7b07bc495665d2a557d40841bbdba (patch) | |
| tree | 34d8240ffc85c581a114493ae7f7cf6c1bfd1f50 | |
| parent | cf4ae4097fcddb3fdfd0e1f5104312d4f5dc673e (diff) | |
| download | scummvm-rg350-b8d5342f34a7b07bc495665d2a557d40841bbdba.tar.gz scummvm-rg350-b8d5342f34a7b07bc495665d2a557d40841bbdba.tar.bz2 scummvm-rg350-b8d5342f34a7b07bc495665d2a557d40841bbdba.zip | |
Remove junk
svn-id: r9891
| -rw-r--r-- | scumm/string.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 5f39617eee..dee0c92e54 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -16,11 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -<<<<<<< string.cpp * $Header$ -======= - * $Header$ ->>>>>>> 1.153 * */ |