fixed conflicts
[arvados.git] / src / views / collection-panel /
drwxr-xr-x   ..
-rw-r--r-- 7797 collection-panel.tsx
-rw-r--r-- 3720 collection-tag-form.tsx