Skip to content
Snippets Groups Projects
Commit 1b5cf4da authored by chrisgarrity's avatar chrisgarrity
Browse files

Fix merge conflicts 

src/containers/blocks.jsx had changed referring to redux state that needed to be updated to use `state.scratchGui`
parents a6d9dbb4 f623de4d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment