From c6a5ec26d99158493f313b9dabb5ffdf8d86ccb4 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.levchenko@jetbrains.com>
Date: Thu, 3 Nov 2016 06:29:41 +0300
Subject: [PATCH] stash conflict occsionaly commited removed

---
 backend.native/tests/build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 16bad61a4ac..c9fbfe1e4c8 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -40,14 +40,9 @@ abstract class KonanTest extends DefaultTask {
                     "-headers", project.project(':runtime').file('src/main/kotlin'),
                     "${sourceKt.absolutePath}"
 
-<<<<<<< Updated upstream
             String libraryPath = "${project.llvmDir}/lib:${backendNative.buildDir.canonicalPath}/nativelibs"
             environment 'LD_LIBRARY_PATH'   : libraryPath
             environment 'DYLD_LIBRARY_PATH' : libraryPath
-=======
-            jvmArgs "-Djava.library.path=${backendNative.buildDir.canonicalPath}/nativelibs"
-	    environment LD_LIBRARY_PATH : "${project.parent.llvmDir}/lib"
->>>>>>> Stashed changes
         }
         return sourceBc
     }