# Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss |
||
|---|---|---|
| .. | ||
| ci_cd_controller.rb | ||
| integrations_controller.rb | ||
| members_controller.rb | ||
| repository_controller.rb | ||
# Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss |
||
|---|---|---|
| .. | ||
| ci_cd_controller.rb | ||
| integrations_controller.rb | ||
| members_controller.rb | ||
| repository_controller.rb | ||