Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

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

Snippets Groups Projects

acec5868

Commit acec5868 authored 6 years ago by Chif Gergő

Downloads
- Plain Diff

Resolve merge conflict in Trainee Reducer

parents cd8e6994 7fe4859b

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/actions/statistics.js 16 additions, 2 deletions

src/actions/statistics.js
src/components/pages/EventDetail.js 1 addition, 2 deletions

src/components/pages/EventDetail.js
src/components/pages/Schedule.js 70 additions, 19 deletions

src/components/pages/Schedule.js
src/reducers/EventReducer.js 1 addition, 1 deletion

src/reducers/EventReducer.js

with 88 additions and 24 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

Hosted with by KSZK