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

How to complete the examples #1

Open
wants to merge 10 commits into
base: broken-examples
Choose a base branch
from
Open

Conversation

benglewis
Copy link
Owner

This Pull Request is simply a placeholder to show a diff for how one should complete the examples

Ben Lewis added 10 commits May 21, 2019 21:45
Simply moving commit head forward.

# Conflicts:
#	examples/2/hello-world/src/App.jsx
#	examples/3/hello-website/src/App.jsx
#	examples/3/hello-website/src/Header.jsx
#	examples/3/hello-website/src/Menu.jsx
#	examples/3/hello-website/src/actions/color.action.jsx
#	examples/3/hello-website/src/reducers/color.reducer.jsx
#	examples/4/hello-website/src/App.jsx
#	examples/4/hello-website/src/Content.jsx
#	examples/4/hello-website/src/actions/text.action.js
#	examples/4/hello-website/src/middleware/apiRequest.middleware.js
#	examples/4/hello-website/src/reducers/text.reducer.js
Ignoring comments in the code, but including the README changes.

# Conflicts:
#	examples/1/index.css
#	examples/1/index.js
#	examples/2/hello-world/src/App.jsx
#	examples/3/hello-website/src/App.jsx
#	examples/3/hello-website/src/Header.jsx
#	examples/3/hello-website/src/Menu.jsx
#	examples/3/hello-website/src/actions/color.action.jsx
#	examples/3/hello-website/src/reducers/color.reducer.jsx
#	examples/4/hello-website/src/App.jsx
#	examples/4/hello-website/src/Content.jsx
#	examples/4/hello-website/src/actions/text.action.js
#	examples/4/hello-website/src/middleware/apiRequest.middleware.js
#	examples/4/hello-website/src/reducers/text.reducer.js
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.

1 participant