Fixed merge conflicts
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-250-45.uio.no>
Thu, 10 Dec 2015 17:10:16 +0000 (18:10 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-250-45.uio.no>
Thu, 10 Dec 2015 17:10:16 +0000 (18:10 +0100)
commit93de70cad65df5ec6618bb7f9c1d366cb28a67fd
treed7b8ca789168dcaba07f6c138e7899f4bb78e8d1
parentbc2a6f4b4500b20a1992986396bc866d457b7c1b
parent1e22a4ed6c1f3e644f834c8997466288ee9d255f
Fixed merge conflicts
src/components/search/search.html
src/components/search/search.ts