File tree
21 files changed
+45
-368
lines changed- demo
- src/main
- java/com/commonsware/cwac/merge/demo
- res
- layout
- values
- gradle/wrapper
- merge
- src/main
- java/com/commonsware/cwac/merge
21 files changed
+45
-368
lines changedLines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 15 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 |
| - | |
| 47 | + | |
48 | 48 |
| |
49 | 49 |
| |
50 | 50 |
| |
| |||
152 | 152 |
| |
153 | 153 |
| |
154 | 154 |
| |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
155 | 160 |
| |
156 | 161 |
| |
157 | 162 |
| |
| |||
166 | 171 |
| |
167 | 172 |
| |
168 | 173 |
| |
169 |
| - | |
| 174 | + | |
170 | 175 |
| |
171 | 176 |
| |
172 | 177 |
| |
| |||
189 | 194 |
| |
190 | 195 |
| |
191 | 196 |
| |
192 |
| - | |
| 197 | + | |
193 | 198 |
| |
194 | 199 |
| |
195 | 200 |
| |
| |||
200 | 205 |
| |
201 | 206 |
| |
202 | 207 |
| |
203 |
| - | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
204 | 214 |
| |
205 | 215 |
| |
206 | 216 |
| |
| 217 | + | |
207 | 218 |
| |
208 | 219 |
| |
209 | 220 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
8 |
| - | |
| 8 | + | |
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
|
Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 3 additions & 18 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
15 |
| - | |
16 |
| - | |
17 |
| - | |
18 |
| - | |
19 |
| - | |
20 |
| - | |
21 |
| - | |
22 |
| - | |
23 |
| - | |
24 |
| - | |
25 |
| - | |
26 |
| - | |
27 |
| - | |
28 |
| - | |
29 |
| - | |
30 |
| - | |
31 |
| - | |
| 15 | + | |
| 16 | + | |
32 | 17 |
|
Lines changed: 0 additions & 85 deletions
This file was deleted.
File renamed without changes.
0 commit comments