Commit e6e6a41
committed
fix(i18n): resolve conflict
1 parent dfa212b commit e6e6a41
1 file changed
+0
-14
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
78 | 77 | | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | 78 | | |
83 | 79 | | |
84 | 80 | | |
| |||
142 | 138 | | |
143 | 139 | | |
144 | 140 | | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | 141 | | |
149 | 142 | | |
150 | | - | |
151 | 143 | | |
152 | 144 | | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | 145 | | |
160 | 146 | | |
161 | 147 | | |
| |||
0 commit comments