[Hawkular-commits] [hawkular/hawkular] 6b0bd0: Fix to bower ECONFLICT on angular version.

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular Commit: 6b0bd0773a2bdbe1109d56974f337e74faa90cd9 https://github.com/hawkular/hawkular/commit/6b0bd0773a2bdbe1109d56974f337... Author: Mike Thompson <mithomps(a)redhat.com&gt; Date: 2015-08-28 (Fri, 28 Aug 2015) Changed paths: M console/src/main/scripts/bower.json Log Message: ----------- Fix to bower ECONFLICT on angular version. Commit: 369f74f9bd4bb83dab5f42a22d67b6250ae36708 https://github.com/hawkular/hawkular/commit/369f74f9bd4bb83dab5f42a22d67b... Author: Mike Thompson <mtho11(a)users.noreply.github.com&gt; Date: 2015-08-28 (Fri, 28 Aug 2015) Changed paths: M console/src/main/scripts/bower.json Log Message: ----------- Merge pull request #428 from hawkular/fix-econflict Fix to bower ECONFLICT on angular version. Compare: https://github.com/hawkular/hawkular/compare/7b168f1cb2e7...369f74f9bd4b