Merge branch 'master' of https://github.com/Xonshiz/comic-dl

Xonshiz · Dec 31, 2017 · 8229bfc · 8229bfc
2 parents 80ef3ce + cc6e3d7
commit 8229bfc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,4 @@
-#Changelog
+# Changelog
 
 - Site support for bato.to [2016.11.15]
 - Bug fix in comic-dl.py and added docs for readthedocs & updated readme [2016.11.20]
@@ -66,5 +66,9 @@
 - Added MangaFox.la (mangafox.me redirects to .la now) [2017.12.27]
 - Added Feature to Search and Download Manga from MangaEden [2017.12.28]
 - Fix for #64 [2017.12.28]
+<<<<<<< HEAD
 - Fix for #62 [2017.12.29]
-- Added Support for [Bato.to](http://bato.to/) [2017.12.31] [No PhantomJS Needed Now]
+- Added Support for [Bato.to](http://bato.to/) [2017.12.31] [No PhantomJS Needed Now]
+=======
+- Fix for [MangaRock.com](https://mangarock.com) #62 [2017.12.29]
+>>>>>>> cc6e3d73b20d5f28d308ee3f106a65265c59b016
diff --git a/Supported_Sites.md b/Supported_Sites.md
@@ -16,4 +16,4 @@
 * [mangareader.net](http://www.mangareader.net/)
 * [readcomicbooksonline.net](http://readcomicbooksonline.net/)
 * [readcomics.website](http://www.readcomics.website/)
-* [mangarock.com](https://mangarock.com/)
+* [mangarock.com](https://mangarock.com/)
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -1,4 +1,4 @@
-#Changelog
+# Changelog
 
 - Site support for bato.to [2016.11.15]
 - Bug fix in comic-dl.py and added docs for readthedocs & updated readme [2016.11.20]
@@ -66,5 +66,9 @@
 - Added MangaFox.la (mangafox.me redirects to .la now) [2017.12.27]
 - Added Feature to Search and Download Manga from MangaEden [2017.12.28]
 - Fix for #64 [2017.12.28]
+<<<<<<< HEAD
 - Fix for #62 [2017.12.29]
-- Added Support for [Bato.to](http://bato.to/) [2017.12.31] [No PhantomJS Needed Now]
+- Added Support for [Bato.to](http://bato.to/) [2017.12.31] [No PhantomJS Needed Now]
+=======
+- Fix for [MangaRock.com](https://mangarock.com) #62 [2017.12.29]
+>>>>>>> cc6e3d73b20d5f28d308ee3f106a65265c59b016
diff --git a/docs/Supported_Sites.md b/docs/Supported_Sites.md
@@ -16,4 +16,4 @@
 * [mangareader.net](http://www.mangareader.net/)
 * [readcomicbooksonline.net](http://readcomicbooksonline.net/)
 * [readcomics.website](http://www.readcomics.website/)
-* [mangarock.com](https://mangarock.com/)
+* [mangarock.com](https://mangarock.com/)