From 7d5660f3e9d362d2167279c720aee3f277600efe Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 15:43:32 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v23.json | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v23.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v23.json
index bb94bf1..5a27e8c 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v23.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v23.json
@@ -1,6 +1,6 @@
[
{
- "outputFile": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
"map": [
{
"to": {
@@ -11,7 +11,7 @@
"endOffset": 185
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 4,
"startColumn": 4,
@@ -30,7 +30,7 @@
"endOffset": 260
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 7,
"startColumn": 4,
@@ -49,7 +49,7 @@
"endOffset": 347
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 8,
"startColumn": 4,
@@ -69,7 +69,7 @@
"endOffset": 675
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 9,
"startColumn": 4,
@@ -90,7 +90,7 @@
"endOffset": 1015
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 15,
"startColumn": 4,
@@ -110,7 +110,7 @@
"endOffset": 1120
},
"from": {
- "file": "D:\\work\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v23\\values-v23.xml",
"position": {
"startLine": 23,
"startColumn": 4,
--
Gitblit v1.8.0