Skip to content

Commit

Permalink
3rd step: Solve merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mrcel97 committed Aug 23, 2018
2 parents 037915c + cb62864 commit 6be9b56
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class Game extends React.Component {
winner;
history;
current;
winnerLine;

constructor(props) {
super(props);
Expand Down

0 comments on commit 6be9b56

Please sign in to comment.