From 2ec341240741b3f34a918cf84be108efd8b0c6c7 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 13 Jun 2013 16:35:48 -0700
Subject: [PATCH] Fix submodules and test_slam_layout

---
 src/support/css/rust-css               | 2 +-
 src/support/netsurfcss/rust-netsurfcss | 2 +-
 src/test/html/test_slam_layout.js      | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/support/css/rust-css b/src/support/css/rust-css
index 09d2db847c1..865f5391143 160000
--- a/src/support/css/rust-css
+++ b/src/support/css/rust-css
@@ -1 +1 @@
-Subproject commit 09d2db847c11bcab7f1832d5daf5947a7c1384ee
+Subproject commit 865f539114383a021822583801e8362faf916699
diff --git a/src/support/netsurfcss/rust-netsurfcss b/src/support/netsurfcss/rust-netsurfcss
index 8fc7400ed33..325cd5197ed 160000
--- a/src/support/netsurfcss/rust-netsurfcss
+++ b/src/support/netsurfcss/rust-netsurfcss
@@ -1 +1 @@
-Subproject commit 8fc7400ed332c3d9edf358c2a18dd047ebde09a6
+Subproject commit 325cd5197ed953f5c7c9317111b20ec1599eaffe
diff --git a/src/test/html/test_slam_layout.js b/src/test/html/test_slam_layout.js
index b42fba50641..7149fba8044 100644
--- a/src/test/html/test_slam_layout.js
+++ b/src/test/html/test_slam_layout.js
@@ -12,7 +12,4 @@ for (var i = 0; i < count; i++) {
 }
 var stop = new Date();
 window.alert((stop - start) / count * 1e6 + " ns/layout");
-<<<<<<< HEAD
-=======
 window.close();
->>>>>>> 0560988... Add link following and refactor the profiler.