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-v12.json | 123 ++++++----------------------------------
1 files changed, 19 insertions(+), 104 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v12.json b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v12.json
index 7a7bae1..5716738 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v12.json
+++ b/VisitFace/DemoForBsk/app/build/intermediates/blame/res/debug/multi/values-v12.json
@@ -1,6 +1,6 @@
[
{
- "outputFile": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v12\\values-v12.xml",
+ "outputFile": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v12\\values-v12.xml",
"map": [
{
"to": {
@@ -12,14 +12,14 @@
"endOffset": 274
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v12\\values-v12.xml",
"position": {
- "startLine": 2,
+ "startLine": 4,
"startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
+ "startOffset": 292,
+ "endLine": 6,
"endColumn": 12,
- "endOffset": 274
+ "endOffset": 511
}
}
},
@@ -33,14 +33,14 @@
"endOffset": 474
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v12\\values-v12.xml",
"position": {
- "startLine": 5,
+ "startLine": 7,
"startColumn": 4,
- "startOffset": 279,
- "endLine": 7,
+ "startOffset": 516,
+ "endLine": 9,
"endColumn": 12,
- "endOffset": 474
+ "endOffset": 711
}
}
},
@@ -53,13 +53,13 @@
"endOffset": 593
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v12\\values-v12.xml",
"position": {
- "startLine": 8,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 479,
+ "startOffset": 716,
"endColumn": 118,
- "endOffset": 593
+ "endOffset": 830
}
}
},
@@ -72,98 +72,13 @@
"endOffset": 688
},
"from": {
- "file": "D:\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
+ "file": "F:\\workspace2\\VisitFace\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.0\\res\\values-v12\\values-v12.xml",
"position": {
- "startLine": 9,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 598,
+ "startOffset": 835,
"endColumn": 94,
- "endOffset": 688
- }
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v12\\values-v12.xml",
- "map": [
- {
- "to": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
- "endColumn": 12,
- "endOffset": 274
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
- "position": {
- "startLine": 2,
- "startColumn": 4,
- "startOffset": 55,
- "endLine": 4,
- "endColumn": 12,
- "endOffset": 274
- }
- }
- },
- {
- "to": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 279,
- "endLine": 7,
- "endColumn": 12,
- "endOffset": 474
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
- "position": {
- "startLine": 5,
- "startColumn": 4,
- "startOffset": 279,
- "endLine": 7,
- "endColumn": 12,
- "endOffset": 474
- }
- }
- },
- {
- "to": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 479,
- "endColumn": 118,
- "endOffset": 593
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
- "position": {
- "startLine": 8,
- "startColumn": 4,
- "startOffset": 479,
- "endColumn": 118,
- "endOffset": 593
- }
- }
- },
- {
- "to": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 598,
- "endColumn": 94,
- "endOffset": 688
- },
- "from": {
- "file": "D:\\Users\\zhangbo\\home\\work\\DemoForBsk\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-v12\\values-v12.xml",
- "position": {
- "startLine": 9,
- "startColumn": 4,
- "startOffset": 598,
- "endColumn": 94,
- "endOffset": 688
+ "endOffset": 925
}
}
}
--
Gitblit v1.8.0