mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
Remove junk
svn-id: r9891
This commit is contained in:
@@ -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
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user