From dbb36a7a7bc81d5397b5da316c9a7d89c76cc52b Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Tue, 15 Sep 2015 11:44:04 +0200
Subject: fixed rebase

---
 test/libsolidity/SolidityEndToEndTest.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'test')

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 05508e2b..cac2d296 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -5233,7 +5233,6 @@ BOOST_AUTO_TEST_CASE(storage_string_as_mapping_key_without_variable)
 	BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(2)));
 }
 
-<<<<<<< HEAD
 BOOST_AUTO_TEST_CASE(library_call)
 {
 	char const* sourceCode = R"(
@@ -5266,22 +5265,6 @@ BOOST_AUTO_TEST_CASE(library_stray_values)
 	BOOST_CHECK(callContractFunction("f(uint256)", u256(33)) == encodeArgs(u256(42)));
 }
 
-BOOST_AUTO_TEST_CASE(array_out_of_bound_access)
-{
-	char const* sourceCode = R"(
-	contract c {
-		uint[2] dataArray;
-		function set5th() returns (bool) {
-			dataArray[5] = 2;
-			return true;
-		}
-	}
-	)";
-	compileRequireThrow<TypeError>(sourceCode);
-}
-
-=======
->>>>>>> 6920415... moved the test
 BOOST_AUTO_TEST_SUITE_END()
 
 }
-- 
cgit