resolve conflicts
0dd9afa8
Svetloslav Novoselski
committed
angular.json/angular.json