Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

해커톤 1팀 DPES PR 드립니다 #2

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

해커톤 1팀 DPES PR 드립니다 #2

wants to merge 59 commits into from

Conversation

couldseeme
Copy link
Collaborator

해커톤 1팀 DPES PR 드립니다

couldseeme and others added 29 commits November 19, 2018 22:50
# Conflicts:
#	.DS_Store
#	dpes-frontend/src/App.vue
#	dpes-frontend/src/router.js
#	dpes-frontend/src/views/Home.vue
#	dpes/package-lock.json
#	dpes/package.json
#	dpes/public/index.html
#	dpes/src/components/HelloWorld.vue
# Conflicts:
#	dpes/src/views/evaluation/GetAuth.vue
#	dpes/src/views/evaluation/GetWallet.vue
#	dpes/src/views/pool/SetOrganization.vue
#	dpes/src/views/pool/SetRewardPool.vue
#	dpes/src/views/pool/SetWorkspace.vue
#	dpes/src/views/profile/ProfileSelfEval.vue
# Conflicts:
#	.DS_Store
#	dpes/src/App.vue
#	dpes/src/views/profile/ProfileHeader.vue
# Conflicts:
#	.DS_Store
#	dpes/src/App.vue
#	dpes/src/router.js
#	dpes/src/views/Signin.vue
#	dpes/src/views/Signup.vue
#	dpes/src/views/evaluation/GroupList.vue
#	dpes/src/views/evaluation/GroupProfileList.vue
#	dpes/src/views/evaluation/WorkspaceList.vue
@sojinkim-icon
Copy link

https://github.com/icon-hackathons/201811-icon-hackathon 이쪽으로 pr 부탁드립니다. submission folder 아래.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants