Remove junk
svn-id: r9891
This commit is contained in:
parent
cf4ae4097f
commit
b8d5342f34
1 changed files with 0 additions and 4 deletions
|
@ -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
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue