Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
|---|---|---|
| .. | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| snowflake.rb | ||
| version.rb | ||
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
|---|---|---|
| .. | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| snowflake.rb | ||
| version.rb | ||