Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b2bab7d8

Commit b2bab7d8 authored 1 year ago by 유 채린

Downloads
- Plain Diff

resolve merge conflict

parents d39ffa40 8fc04dc6

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

src/components/channel/addNotice.js 14 additions, 16 deletions

src/components/channel/addNotice.js
src/components/channel/channel.js 1 addition, 1 deletion

src/components/channel/channel.js
src/components/infiniteScroll.js 17 additions, 34 deletions

src/components/infiniteScroll.js
src/components/search.js 9 additions, 12 deletions

src/components/search.js
src/pages/subscribe.js 1 addition, 1 deletion

src/pages/subscribe.js

with 42 additions and 64 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr