Skip to content

Commit f64b1ab

Browse files
committed
fix merge conflict
2 parents 7360337 + 75eaed7 commit f64b1ab

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
174174

175175
## License
176176

177-
<<<<<<< HEAD
178-
The data is available to the public strictly for educational and academic research purposes. Please link to this repo somewhere in your project if you can (not required) :).
179-
=======
180177
The data is available to the public strictly for educational and academic research purposes. Please link to this repo somewhere in your project :).
181-
182-
>>>>>>> 75eaed76fc26be64fbffe6999be24208c3665b8d

0 commit comments

Comments
 (0)