fixing conflicts

This commit is contained in:
Daniela Arcese 2017-06-04 14:07:42 -04:00
parent f56961b245
commit 9ccf707476

View File

@ -90,8 +90,5 @@
</g> </g>
</g> </g>
</g> </g>
<<<<<<< HEAD
</svg> </svg>
=======
</svg>
>>>>>>> upload page ui

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB