Skip to content

Commit 35c54f0

Browse files
Resolved merge conflict between master and feature branch
2 parents a0b22a1 + 210a391 commit 35c54f0

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ We are on [Discord](https://the-algorithms.com/discord) and [Gitter](https://git
5050
## 📜 List of Algorithms
5151

5252
See our [directory](DIRECTORY.md) for easier navigation and a better overview of the project.
53+
This line was added from the feature branch.
5354
This line was added from the master branch.

0 commit comments

Comments
 (0)