Luke Pulverenti d33230d361 fix merge conflicts

2016-01-19 14:49:42 -05:00

..

itemidentifier.js

fix merge conflicts

2016-01-19 14:49:42 -05:00

itemidentifier.template.html

rework dialog headers

2015-12-15 15:10:41 -05:00