From 8d2141fdf8b985f24612ba13f6dfcfd242fa206a Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 14 Apr 2015 16:52:23 +0200 Subject: [PATCH] fixed bad commit --- mix/test/qml/TestMain.qml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mix/test/qml/TestMain.qml b/mix/test/qml/TestMain.qml index fb0c01adf..d1d962900 100644 --- a/mix/test/qml/TestMain.qml +++ b/mix/test/qml/TestMain.qml @@ -76,11 +76,8 @@ TestCase function test_dbg_transactionWithParameter() { TestDebugger.test_transactionWithParameter(); } function test_dbg_constructorParameters() { TestDebugger.test_constructorParameters(); } function test_dbg_arrayParametersAndStorage() { TestDebugger.test_arrayParametersAndStorage(); } -<<<<<<< HEAD function test_miner_getDefaultiner() { TestMiner.test_getDefaultMiner(); } function test_miner_selectMiner() { TestMiner.test_selectMiner(); } -======= function test_project_contractRename() { TestProject.test_contractRename(); } ->>>>>>> up/develop }