From 0801ae5364519b19d57791557706506779db63a4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 1 Mar 2016 18:00:34 +0300 Subject: [PATCH] Minor, delete weird intermediate git files --- ...nerClasses & EnclosingMethod attributes for local classes | 5 ----- .../fileClasses/multifileClassWithCrossCall/Baz.java~HEAD | 5 ----- ...nerClasses & EnclosingMethod attributes for local classes | 5 ----- .../fileClasses/multifileClassWithCrossCall/foo.kt~HEAD | 5 ----- ...nerClasses & EnclosingMethod attributes for local classes | 1 - .../multifileClassWithInternal.kt~HEAD | 1 - 6 files changed, 22 deletions(-) delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~- InnerClasses & EnclosingMethod attributes for local classes delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~HEAD delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~- InnerClasses & EnclosingMethod attributes for local classes delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~HEAD delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~- InnerClasses & EnclosingMethod attributes for local classes delete mode 100644 compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~HEAD diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~- InnerClasses & EnclosingMethod attributes for local classes b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~- InnerClasses & EnclosingMethod attributes for local classes deleted file mode 100644 index d5fd7bcb24a..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~- InnerClasses & EnclosingMethod attributes for local classes +++ /dev/null @@ -1,5 +0,0 @@ -public class Baz { - public static String baz() { - return Util.foo() + Util.bar(); - } -} \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~HEAD b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~HEAD deleted file mode 100644 index d5fd7bcb24a..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/Baz.java~HEAD +++ /dev/null @@ -1,5 +0,0 @@ -public class Baz { - public static String baz() { - return Util.foo() + Util.bar(); - } -} \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~- InnerClasses & EnclosingMethod attributes for local classes b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~- InnerClasses & EnclosingMethod attributes for local classes deleted file mode 100644 index 6c6939f4453..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~- InnerClasses & EnclosingMethod attributes for local classes +++ /dev/null @@ -1,5 +0,0 @@ -@file:JvmName("Util") -@file:JvmMultifileClass -public fun foo(): String = foox() - -public fun barx(): String = "K" \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~HEAD b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~HEAD deleted file mode 100644 index 6c6939f4453..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/foo.kt~HEAD +++ /dev/null @@ -1,5 +0,0 @@ -@file:JvmName("Util") -@file:JvmMultifileClass -public fun foo(): String = foox() - -public fun barx(): String = "K" \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~- InnerClasses & EnclosingMethod attributes for local classes b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~- InnerClasses & EnclosingMethod attributes for local classes deleted file mode 100644 index 936b887daa8..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~- InnerClasses & EnclosingMethod attributes for local classes +++ /dev/null @@ -1 +0,0 @@ -fun box(): String = Baz.baz() \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~HEAD b/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~HEAD deleted file mode 100644 index 936b887daa8..00000000000 --- a/compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/multifileClassWithInternal.kt~HEAD +++ /dev/null @@ -1 +0,0 @@ -fun box(): String = Baz.baz() \ No newline at end of file