diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-20 15:57:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 15:57:53 -0500 |
| commit | eb22adce9a3a0d8d02c27d7afc944857e9ca0ada (patch) | |
| tree | 449385b6004d6c3d91f41b2e0eb8e990fc97ee0f /actionpack/test/abstract | |
| parent | 023a840f5f10c5a611a0618ff8ea9e16cd771f93 (diff) | |
| parent | dde9c488398293fb1cbdc02595b8c4e9860b03cc (diff) | |
| download | rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.gz rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.bz2 rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.zip | |
Merge pull request #34494 from gmcgibbon/warn_root_conflict
Stop using unnamed roots on conflict
Diffstat (limited to 'actionpack/test/abstract')
0 files changed, 0 insertions, 0 deletions