# Conflicts: # common/contract.ts # package.json # web/components/contract/quick-bet.tsx # web/components/outcome-label.tsx # web/components/resolution-panel.tsx |
||
|---|---|---|
| .. | ||
| api | ||
| firebase | ||
| icons | ||
| service | ||
| simulator | ||
| util | ||
# Conflicts: # common/contract.ts # package.json # web/components/contract/quick-bet.tsx # web/components/outcome-label.tsx # web/components/resolution-panel.tsx |
||
|---|---|---|
| .. | ||
| api | ||
| firebase | ||
| icons | ||
| service | ||
| simulator | ||
| util | ||