Commit 2756f39
committed
revert changes for conflict resolve dialog
Signed-off-by: alperozturk <alper_ozturk@proton.me>1 parent a1c55cf commit 2756f39
File tree
1 file changed
+0
-12
lines changed- app/src/main/java/com/owncloud/android/utils
1 file changed
+0
-12
lines changedLines changed: 0 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
| |||
74 | 73 | | |
75 | 74 | | |
76 | 75 | | |
77 | | - | |
78 | 76 | | |
79 | 77 | | |
80 | 78 | | |
| |||
86 | 84 | | |
87 | 85 | | |
88 | 86 | | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | 87 | | |
100 | 88 | | |
101 | 89 | | |
| |||
0 commit comments