mirror of
https://github.com/status-im/nim-raft.git
synced 2025-02-07 10:45:04 +00:00
fix remnants of merge conflict
This commit is contained in:
parent
554c73c968
commit
5876558920
@ -22,8 +22,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
<<<<<<< HEAD
|
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
=======
|
|
||||||
SOFTWARE.
|
|
||||||
>>>>>>> f81bcdf (Add license files)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user