From 45dfeddc5e7a962a8d68ebe44fa5832dd9b0aa84 Mon Sep 17 00:00:00 2001
From: "Hallvord R. M. Steen" <hsteen@mozilla.com>
Date: Tue, 1 Apr 2014 08:18:59 +0200
Subject: [PATCH] not sure how this .orig file got added..

---
 .../abort-upload-event-abort.htm.orig         | 95 -------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 XMLHttpRequest/abort-upload-event-abort.htm.orig
diff --git a/XMLHttpRequest/abort-upload-event-abort.htm.orig b/XMLHttpRequest/abort-upload-event-abort.htm.orig
deleted file mode 100644
index 6108f339255635..00000000000000
--- a/XMLHttpRequest/abort-upload-event-abort.htm.orig
+++ /dev/null
@@ -1,95 +0,0 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" />
-    <script src="/resources/testharness.js"></script>
-    <title>XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
-
-        test.step(function()
-        {
-            var xhr = new XMLHttpRequest();
-
-            xhr.onreadystatechange = function()
-            {
-                test.step(function()
-                {
-                    if (xhr.readyState == 1)
-                    {
-                        xhr.abort();
-                    }
-                });
-            };
-
-            xhr.upload.onabort = function(e)
-            {
-                test.step(function() 
-                {
-                    assert_true(e instanceof ProgressEvent);
-                    assert_equals(e.type, "abort");
-                    assert_equals(e.target, xhr.upload);
-                    test.done();
-                });
-            };
-
-            xhr.open("POST", "./resources/content.py", true);
-            xhr.send("Test Message");
-        });
-    </script>
-</body>
-</html>
-=======
-﻿<!DOCTYPE html>
-<html>
-<head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" />
-    <script src="/resources/testharness.js"></script>
-    <title>XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title>
-</head>
-
-<body>
-    <div id="log"></div>
-
-    <script type="text/javascript">
-        var test = async_test();
-
-        test.step(function()
-        {
-            var xhr = new XMLHttpRequest();
-
-            xhr.onloadstart = function()
-            {
-                test.step(function()
-                {
-                    if (xhr.readyState == 1)
-                    {
-                        xhr.abort();
-                    }
-                });
-            };
-
-            xhr.upload.onabort = function(e)
-            {
-                test.step(function()
-                {
-                    assert_true(e instanceof ProgressEvent);
-                    assert_equals(e.type, "abort");
-                    assert_equals(e.target, xhr.upload);
-                    test.done();
-                });
-            };
-
-            xhr.open("POST", "./resources/content.php", true);
-            xhr.send("Test Message");
-        });
-    </script>
-</body>
-</html>
->>>>>>> call abort() from loadstart to avoid send() throwing (bugfix, test was broken)
