Commit a13c2b4
committed
resolving conflickts in type.ts fiel and create-app.ts file
1 parent 6807462 commit a13c2b4
File tree
3 files changed
+1
-16
lines changed- packages/create/src
- frameworks/react/add-ons/strapi
3 files changed
+1
-16
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
234 | 234 | | |
235 | 235 | | |
236 | 236 | | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | 237 | | |
241 | 238 | | |
242 | 239 | | |
243 | 240 | | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | 241 | | |
248 | 242 | | |
249 | 243 | | |
250 | 244 | | |
251 | 245 | | |
252 | 246 | | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | 247 | | |
258 | 248 | | |
259 | 249 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
| 40 | + | |
45 | 41 | | |
46 | 42 | | |
47 | 43 | | |
| |||
0 commit comments