Fixed merge conflict

This commit is contained in:
Pranav Srinivas KumaR
2019-12-04 21:11:38 -06:00

View File

@@ -17,8 +17,8 @@
* Thread-safe `ProgressBar` and `ProgressSpinner` classes
* Header-only library. Grab a copy of `include/indicators`
* MIT License
* Source for the above GIF can be found [here](demo/demo.cpp)
* MIT License
# Progress bar