removed unused file

This commit is contained in:
Tudor Stanciu 2019-02-19 01:20:10 +02:00
parent 13041cc163
commit 64a1f2d70b

View File

@ -1,6 +0,0 @@
<<<<<<< HEAD
test commit
test commit 2
=======
test commit
>>>>>>> aa8e536bf0c81319b1cbf92ce26cb3de3083e759