Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

While I was checking in fix of 88363 yesterday, a conflict mess got into my

Browse Source 
check in. Remove that mess.


git-svn-id: svn://10.0.0.236/trunk@105226 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
shanjian%netscape.com
2001-10-11 23:46:27 +00:00
parent b2899caa28
commit f87e8450ce
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp
View File

@@ -2,31 +2,16 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
<<<<<<< nsXMLHttpRequest.cpp
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
=======
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
>>>>>>> 1.43
*
<<<<<<< nsXMLHttpRequest.cpp
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
=======
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
>>>>>>> 1.43
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is