IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work through merge conflict

Browse Source
This commit is contained in:
Matt Rider 2019-05-24 08:23:50 -03:00
parent 460d081d52
commit 51d25c1c9a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/pages/profile/_id/_slug.vue
View File

@ -344,10 +344,7 @@ export default {
HcLoadMore,
HcEmpty,
ContentMenu,
<<<<<<< HEAD
HcUpload
=======
>>>>>>> 9d1dfe6067280b792b752b46608e443aa3925616
},
transition: {
name: 'slide-up',