Doc fixes

CHANGELOG.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ## [1.0.0](https://github.com/l7ssha/nyxx/compare/0.23.1...1.0.0)
 _Tue xx.xx.2018_
 
@@ -31,7 +30,7 @@ _Tue xx.xx.2018_
   * Internal nyxx API changes
   * Cooldown cache rewritten
   * Title is not required for EmbedBuilder
-=======
+
 ## [0.24.0](https://github.com/l7ssha/nyxx/compare/0.23.1...0.24.0)
 _Tue 03.08.2018_
 
@@ -44,7 +43,6 @@ _Tue 03.08.2018_
 - **Bug fixes**
   * Fixed `Command` help generating error
   * Fixed Emojis equals operator
->>>>>>> fb46baac964e5119e5c5751cb958375b7f9f884f
 
 ## [0.23.1](https://github.com/l7ssha/nyxx/compare/0.23.0...0.23.1)
 _Tue 31.07.2018_

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 2018, Szymoon 'l7ssha' Uglis, Hackzzila
+ Copyright (C) 2018, Szymon 'l7ssha' Uglis, Hackzzila
  
                             Preamble
 

README.md

@@ -59,13 +59,4 @@ The dartdocs page will always have the documentation for the latest release.
 You can read about upcoming changes to the library on my website.
 
 #### [Wiki](https://github.com/l7ssha/nyxx/wiki)
-Wiki documentation are designed to match the latest Nyxx release.
-
-## Roadmap
- - [ ] Better dartdocs documentation
- - [x] More examples at wiki/more tutorial/Video tutorial 
- - [ ] Bigger bot written in nyxx for example
- - [ ] Fix `lint` errors from `dartanalyzer`
- - [x] Annotation driver flow for CommandsFramework?
- - [x] Recheck all code and fix styling/small logic bugs
- - [ ] Support for Voice connection
+Wiki documentation are designed to match the latest Nyxx release.