Commit 71d1884
committed
fix git conflict
Signed-off-by: alperozturk <[email protected]>1 parent 659bac9 commit 71d1884
File tree
1 file changed
+6
-0
lines changed- app/src/main/java/com/owncloud/android/ui/fragment
1 file changed
+6
-0
lines changedLines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
425 | 425 | | |
426 | 426 | | |
427 | 427 | | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
428 | 434 | | |
0 commit comments