Merge branch 'master' into 3.x

apipkin · Oct 12, 2012 · 5b8b97f · 5b8b97f
2 parents 1d1ad39 + fa74882
commit 5b8b97f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/src/async-queue/tests/unit/async-queue.html b/src/async-queue/tests/unit/async-queue.html
@@ -2,7 +2,6 @@
 <html>
 <head>
     <title>Test Page</title>
-    <link type="text/css" rel="stylesheet" href="assets/test.css">
 </head>
 <body class="yui3-skin-sam">
 

diff --git a/src/datatable/tests/unit/datatable-sort.html b/src/datatable/tests/unit/datatable-sort.html
@@ -2,7 +2,6 @@
 <html>
 <head>
     <title>Test Page</title>
-    <link type="text/css" rel="stylesheet" href="assets/test.css">
 </head>
 <body class="yui3-skin-sam">
 

diff --git a/src/dom/tests/unit/dom-xy.html b/src/dom/tests/unit/dom-xy.html
@@ -28,7 +28,7 @@
     }
 
     body {
-        background-image: url( grid.png );
+        /*background-image: url( grid.png );*/
         background-position: -12.5px -12.5px;
         Xborder: 30px solid blue; /* manual test: false negative */
         height: 2000px;