azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Konstantin Anisimov
2017-02-02 17:13:19 +07:00
parent 4be3649daf
commit 263e658b1b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+4 -5
View File
@@ -1010,7 +1010,6 @@ task inline3(type: RunKonanTest) {
source = "codegen/inline/inline3.kt" source = "codegen/inline/inline3.kt"
} }
<<<<<<< HEAD
task inline4(type: RunKonanTest) { task inline4(type: RunKonanTest) {
goldValue = "3\n" goldValue = "3\n"
source = "codegen/inline/inline4.kt" source = "codegen/inline/inline4.kt"
@@ -1024,8 +1023,8 @@ task inline5(type: RunKonanTest) {
task inline9(type: RunKonanTest) { task inline9(type: RunKonanTest) {
goldValue = "hello\n6\n" goldValue = "hello\n6\n"
source = "codegen/inline/inline9.kt" source = "codegen/inline/inline9.kt"
======= }
task vararg0(type: RunKonanTest) {
source = "lower/vararg.kt" task vararg0(type: RunKonanTest) {
>>>>>>> b4ee0e86d2890b3aca7eab4e1910a90fedff2b55 source = "lower/vararg.kt"
} }