From 99b6196bde4773fd26bd733ecf5e3984ce0a4c63 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 12 Jan 2016 14:03:07 +0100
Subject: fix compilation after merge

---
 .idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml     | 1 -
 .idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml   | 1 -
 .idea/libraries/Gradle__com_google_inject_guice_4_0.xml     | 1 -
 .idea/libraries/Gradle__javax_inject_javax_inject_1.xml     | 1 -
 .idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml | 8 ++++++--
 core/src/test/kotlin/model/LinkTest.kt                      | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml
index 4abfa0ea..dfd1af5e 100644
--- a/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml
+++ b/.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml
@@ -2,7 +2,6 @@
   <library name="Gradle: aopalliance:aopalliance:1.0">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml b/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml
index 05aa1ed6..53ca37d2 100644
--- a/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml
+++ b/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml
@@ -2,7 +2,6 @@
   <library name="Gradle: com.google.guava:guava:16.0.1">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/16.0.1/5fa98cd1a63c99a44dd8d3b77e4762b066a5d0c5/guava-16.0.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/16.0.1/guava-16.0.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml b/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml
index d28cc3ab..87bea56e 100644
--- a/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml
+++ b/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml
@@ -2,7 +2,6 @@
   <library name="Gradle: com.google.inject:guice:4.0">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.0/f990a43d3725781b6db7cd0acf0a8b62dfd1649/guice-4.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/4.0/guice-4.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
index e45b86eb..d92a5618 100644
--- a/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
@@ -2,7 +2,6 @@
   <library name="Gradle: javax.inject:javax.inject:1">
     <CLASSES>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml
index c84716ad..7a072a3b 100644
--- a/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml
+++ b/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml
@@ -1,7 +1,11 @@
 <component name="libraryTable">
   <library name="Gradle: org.fusesource.jansi:jansi:1.11">
-    <CLASSES />
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/655c643309c2f45a56a747fda70e3fadf57e9f11/jansi-1.11.jar!/" />
+    </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/2f0e4b53b6b0eec426dad7118bf54b3deb58000b/jansi-1.11-sources.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/core/src/test/kotlin/model/LinkTest.kt b/core/src/test/kotlin/model/LinkTest.kt
index bcb1007c..71d31511 100644
--- a/core/src/test/kotlin/model/LinkTest.kt
+++ b/core/src/test/kotlin/model/LinkTest.kt
@@ -1,10 +1,10 @@
 package org.jetbrains.dokka.tests
 
+import org.jetbrains.dokka.NodeKind
 import org.junit.Test
-import kotlin.test.*
-import org.jetbrains.dokka.*
+import kotlin.test.assertEquals
 
-public class LinkTest {
+class LinkTest {
     @Test fun linkToSelf() {
         verifyModel("testdata/links/linkToSelf.kt") { model ->
             with(model.members.single().members.single()) {
@@ -29,7 +29,7 @@ public class LinkTest {
         verifyModel("testdata/links/linkToConstantWithUnderscores.kt") { model ->
             with(model.members.single().members.single()) {
                 assertEquals("Foo", name)
-                assertEquals(DocumentationNode.Kind.Class, kind)
+                assertEquals(NodeKind.Class, kind)
                 assertEquals("This is link to [MY_CONSTANT_VALUE -> CompanionObjectProperty:MY_CONSTANT_VALUE]", content.summary.toTestString())
             }
         }
-- 
cgit