From 05003d52c9b2f2a817d37c282cf1768343f5ac41 Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Wed, 18 Sep 2013 14:05:48 -0400
Subject: [PATCH] merge

---
 .../ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java
index 1a858727f..2421302de 100755
--- a/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java
+++ b/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java
@@ -296,8 +296,6 @@ public abstract class TestSimplePageCallGraphShape extends TestJSCallGraphShape
     verifyGraphAssertions(CG, assertionsForWindowx);
   }
 
-<<<<<<< HEAD
-=======
   private static final Object[][] assertionsForWindowOnload = new Object[][] {
     new Object[] { ROOT, new String[] { "windowonload.html" } },
     new Object[] { "windowonload.html", new String[] { "windowonload.html/__WINDOW_MAIN__" } },
@@ -312,8 +310,6 @@ public abstract class TestSimplePageCallGraphShape extends TestJSCallGraphShape
     verifyGraphAssertions(CG, assertionsForWindowOnload);
   }
   
-
->>>>>>> 8984637b86dd09a60d973627e83d1daf648826a8
   /*
   @Test public void testJQuery() throws IOException, IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/jquery.html");