removed unused file
parent
13041cc163
commit
64a1f2d70b
|
@ -1,6 +0,0 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
test commit
|
|
||||||
test commit 2
|
|
||||||
=======
|
|
||||||
test commit
|
|
||||||
>>>>>>> aa8e536bf0c81319b1cbf92ce26cb3de3083e759
|
|
Loading…
Reference in New Issue