From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Tue, 15 Dec 2015 20:43:45 +0000
Subject: Migrate to IntelliJ format, also contains some minor logging changes
 and moved libraries

---
 .../intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml    | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml

(limited to 'app/build/intermediates/incremental/mergeDebugAndroidTestAssets')

diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
new file mode 100644
index 0000000..044afb9
--- /dev/null
+++ b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/androidTest/assets"/></dataSet></merger>
\ No newline at end of file
-- 
cgit v1.2.3