Skip to content

Commit

Permalink
Merge conflict corrections with upstream master.
Browse files Browse the repository at this point in the history
  • Loading branch information
@guastallaigor
guastallaigor committed Nov 30, 2018
2 parents 3bb7fd9 + 9461eaa commit 7595362
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions css/nes.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7595362

Please sign in to comment.