From 99b6196bde4773fd26bd733ecf5e3984ce0a4c63 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov 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 ++++++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to '.idea/libraries') 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - + + + - + + + \ No newline at end of file -- cgit