summaryrefslogtreecommitdiff
path: root/app/build/intermediates/incremental/mergeDebugAssets
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/mergeDebugAssets
parenteb7c5e7d7b332fb488658bb84066b0b3c516896e (diff)
Migrate to IntelliJ format, also contains some minor logging changes and moved librariesHEADmaster
Diffstat (limited to 'app/build/intermediates/incremental/mergeDebugAssets')
-rw-r--r--app/build/intermediates/incremental/mergeDebugAssets/merger.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..d9664ac
--- /dev/null
+++ b/app/build/intermediates/incremental/mergeDebugAssets/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/main/assets"/></dataSet><dataSet config="debug"><source path="/home/joe/AndroidstudioProjects/blauploader1/app/src/debug/assets"/></dataSet></merger> \ No newline at end of file