Skip to content

Commit

Permalink
A silly change
Browse files Browse the repository at this point in the history
  • Loading branch information
Viktor Farcic committed Feb 11, 2020
1 parent 96916d1 commit c6b30eb
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
## Replace master with orig

```bash
git checkout orig

git merge -s ours master

git checkout master

git merge orig

git push
```

A silly change

0 comments on commit c6b30eb

Please sign in to comment.