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 - 1 file changed, 1 deletion(-) (limited to '.idea/libraries/Gradle__aopalliance_aopalliance_1_0.xml') 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 @@ - -- cgit