merged

angular.json

netex/assets/styles/fonts/primeicons.eot

netex/assets/styles/fonts/primeicons.svg

netex/assets/styles/fonts/primeicons.ttf

netex/assets/styles/fonts/primeicons.woff

netex/assets/styles/primeicons.css

netex/assets/styles/primeng.min.css

netex/assets/styles/theme.css

package-lock.json

package.json

src/assets/.gitkeep

src/assets/leg2.png

src/assets/ll2.png

src/assets/styles/images/color.png

src/assets/styles/images/hue.png

src/assets/styles/images/line.gif

src/assets/styles/images/loading.gif

src/assets/styles/images/password-meter.png

src/assets/uniprot.png

src/environments/environment.old.ts