summaryrefslogtreecommitdiff
path: root/app/build/intermediates/incremental/mergeDebugAndroidTestResources
diff options
context:
space:
mode:
authorJoe Robinson <joe@lc8n.com>2015-12-15 20:43:45 +0000
committerJoe Robinson <joe@lc8n.com>2015-12-15 20:43:45 +0000
commit30d164851ac3d4e7397e010baa24a8e5cb0dc090 (patch)
treefcb45696618d4588fb4fcd052db2c217e587d82e /app/build/intermediates/incremental/mergeDebugAndroidTestResources
parenteb7c5e7d7b332fb488658bb84066b0b3c516896e (diff)
Migrate to IntelliJ format, also contains some minor logging changes and moved librariesHEADmaster
Diffstat (limited to 'app/build/intermediates/incremental/mergeDebugAndroidTestResources')
-rw-r--r--app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..bcb39da
--- /dev/null
+++ b/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/androidTest/res"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/rs/androidTest/debug"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/resValues/androidTest/debug"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/androidTest/res"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/rs/androidTest/debug"/><source path="/home/joe/AndroidstudioProjects/blauploader1/app/build/generated/res/resValues/androidTest/debug"/></dataSet><mergedItems/></merger> \ No newline at end of file