[obs-commits] [openSUSE/open-build-service] 5f3950: [webui] Remove duplicate search_owners_list

Branch: refs/heads/2.6 Home: https://github.com/openSUSE/open-build-service Commit: 5f3950328d68dae4eac3e753ebaf951185d20a05 https://github.com/openSUSE/open-build-service/commit/5f3950328d68dae4eac3e7... Author: Christian Bruckmayer Date: 2015-11-05 (Thu, 05 Nov 2015) Changed paths: M src/api/app/views/webui/search/_owners.html.erb Log Message: ----------- [webui] Remove duplicate search_owners_list Probably caused by a merge conflict. Commit: 60a5ef3859319cc5ff5969bb8162680bb8338181 https://github.com/openSUSE/open-build-service/commit/60a5ef3859319cc5ff5969... Author: Christian Bruckmayer Date: 2015-11-05 (Thu, 05 Nov 2015) Changed paths: M src/api/app/views/webui/search/_owners.html.erb Log Message: ----------- Merge pull request #1345 from ChrisBr/2.6 [webui] Remove duplicate search_owners_list Compare: https://github.com/openSUSE/open-build-service/compare/a42c0f718566...60a5ef...