Skip to content

Commit f699668

Browse files
committed
updated version and removed conflict
2 parents 2e82702 + a031aba commit f699668

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Interlace/lib/core/__version__.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
__version__ = '1.5.1'
2-

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,5 +179,5 @@ Using the above example, let's assume you want independent scans to be via diffe
179179
Originally written by Michael Skelton ([codingo](https://twitter.com/codingo_)) and Sajeeb Lohani ([sml555](https://twitter.com/sml555_)) with help from Charelle Collett ([@Charcol0x89](https://twitter.com/Charcol0x89)) for threading refactoring and overall approach, and Luke Stephens ([hakluke](https://twitter.com/hakluke)) for testing and approach.
180180

181181
# Contributions
182-
Contributions to this project are very welcome. If you're a newcomer to open source and would like some help in doing so, feel free to reach out to us on twitter ([@codingo_](https://twitter.com/codingo_)) / ([@sml555_](https://twitter.com/sml555_)) and I'll assist wherever I can.
182+
Contributions to this project are very welcome. If you're a newcomer to open source and would like some help in doing so, feel free to reach out to us on twitter ([@codingo_](https://twitter.com/codingo_)) / ([@sml555_](https://twitter.com/sml555_)) and we'll assist wherever we can.
183183

0 commit comments

Comments
 (0)