From f87e8450cee44f4a06b577667642f47aefb3f231 Mon Sep 17 00:00:00 2001 From: "shanjian%netscape.com" Date: Thu, 11 Oct 2001 23:46:27 +0000 Subject: [PATCH] While I was checking in fix of 88363 yesterday, a conflict mess got into my check in. Remove that mess. git-svn-id: svn://10.0.0.236/trunk@105226 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xmlextras/base/src/nsXMLHttpRequest.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index beeccf17766..b54c86a75ab 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -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