# Conflicts: # public/views/onboarding/notifications.html # src/js/controllers/onboarding/collectEmail.js |
||
|---|---|---|
| .. | ||
| backupRequest.html | ||
| backupWarning.html | ||
| collectEmail.html | ||
| disclaimer.html | ||
| notifications.html | ||
| tour.html | ||
| welcome.html | ||
# Conflicts: # public/views/onboarding/notifications.html # src/js/controllers/onboarding/collectEmail.js |
||
|---|---|---|
| .. | ||
| backupRequest.html | ||
| backupWarning.html | ||
| collectEmail.html | ||
| disclaimer.html | ||
| notifications.html | ||
| tour.html | ||
| welcome.html | ||