fixed formatting

README.md

@@ -1,23 +1,18 @@
 # PTCL-Router:
 
-<<<<<<< HEAD
-A PTCL-Router API.
-=======
-A CLI-script which allows to obtain information and configure PTCL router settings from commandline. 
->>>>>>> origin/master
+A PTCL-Router API. A CLI-script which allows to obtain information and configure PTCL router settings from commandline. 
+
 
 # Current-Features:
 
 - Obtain station information, showing their hostnames alongside for better readability (devices currently connected to the router).
 - Obtain DHCP information.
 - Block and unblock devices using their mac addresses.
-<<<<<<< HEAD
 - Block and unblock devices using their predefined aliases. 
 - Reboot router.
 - Over-ride hostnames associated to the mac address with custom hostnames.
 - Display blocked devices.
 - Added two modes for blocking users ( CLI-MODE and SILENT-MODE (Default) ).
-=======
 - Block and unblock devices using their aliases/nicknames predefined. 
 For example:
 ```python
@@ -46,7 +41,6 @@ will block the user John off the network.
 >>> python ptcl.py -sd
 ```
 
-<<<<<<< HEAD
 **Reboots the router.**
 
 ```python
@@ -68,7 +62,7 @@ will block the user John off the network.
 - [ ] Option to change router transmission power.
 - [ ] Improving display for blocked devices.
 - [ ] Exclude android devices from station info and dhcp info.
-=======
+
 # TODO:
 
 - Writing better documentation.
@@ -83,24 +77,21 @@ will block the user John off the network.
 
 - [ ] Exclude android devices from station info and dhcp info.
 - [X] Reboot router from script.
->>>>>>> origin/master
 - [ ] Time restriction for user (by specifying or choosing from station info) device mac address or hostname.
 - [ ] Adding URL to block unnecessary use for a website, also time limit for a site usage.
 - [ ] Monitor devices connection info i.e., when they connect to the router and disconnect. Also devices uptime of the day.
 - [ ] Block devices who remain connected to the router for x time (6 hours). Unblock them after 6 hours.
 - [ ] Searching suspected users in the station info (Currently Active Devices) when speed is slow.
 - [ ] Getting device connection info in a nice CSV file.
 - [ ] Uploading CSV on a cloud everyday.
-<<<<<<< HEAD
 - [ ] Add CLI MODE for unblocking devices
 - [X] Setting up custom hostname for specific device (mac address).
 - [X] Optimize Regular Expressions.
 - [X] CLI MODE and SILENT MODE for blocking devices.
 - [X] Testing on other routers from the same vendor.
 - [X] Reboot router from script.
 - [X] Display number of active devices.
-=======
->>>>>>> origin/master
+