From dbad306766a83cce21bb9f750690ef67f98c38e1 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sat, 5 Aug 2017 13:23:15 +0200
Subject: [PATCH] Resolve merge issue.

---
 .../java/ruffyscripter/RuffyScripterInstrumentedTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/ruffyscripter/RuffyScripterInstrumentedTest.java b/app/src/androidTest/java/ruffyscripter/RuffyScripterInstrumentedTest.java
index 4374de8bc0..a41d645ecd 100644
--- a/app/src/androidTest/java/ruffyscripter/RuffyScripterInstrumentedTest.java
+++ b/app/src/androidTest/java/ruffyscripter/RuffyScripterInstrumentedTest.java
@@ -64,7 +64,7 @@ public class RuffyScripterInstrumentedTest {
 
             @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
-                ruffyScripter = new RuffyScripter(IRuffyService.Stub.asInterface(service));
+                ruffyScripter = new RuffyScripter();
                 log.debug("ruffy serivce connected");
             }