Pep8 white space fixes

akanda/quantum/README.rst

@@ -90,7 +90,7 @@ Quantum Extensions install:
 
     quota_driver = quantum.extensions._quotav2_driver.DbQuotaDriver
 
-10. Run ./stack.sh again to generate the required DB migrations and start services
+10. Run ./stack.sh again to generate the required DB migrations and start services.
 
 11. You should see:
 
@@ -105,7 +105,7 @@ plugin <quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 object
 
 To manually start and stop Quantum Services under DevStack:
 
-1. Run 'screen -x'
+1. Run 'screen -x'. To show a list of screens, use Ctrl+A+"
 2. Select q-svc. In most cases - Ctrl+A+1 should work.
 3. Run the following to start Quantum or Ctrl+C to stop:
 

akanda/quantum/addressbook.py

@@ -2,10 +2,8 @@ from quantum.api.v2 import attributes
 from quantum.db import models_v2
 from quantum.extensions import extensions
 
-<<<<<<< HEAD:akanda/userapi/addressbook.py
+
 from quantum.extensions import _authzbase
-from quantum.db import models
-=======
 from akanda.quantum import _authzbase
 from akanda.quantum.db import models
 
@@ -43,7 +41,6 @@ class AddressBookResource(_authzbase.ResourceDelegate):
                'name': addressbook['name'],
                'groups': [group['id']
                            for group in addressbook['groups']]}
-
         return res
 
 

akanda/quantum/portforward.py

@@ -1,10 +1,8 @@
 from quantum.api.v2 import attributes
 from quantum.extensions import extensions
 
-<<<<<<< HEAD:akanda/userapi/portforward.py
 from quantum.extensions import _authzbase
 from quantum.db import models
-=======
 from akanda.quantum import _authzbase
 from akanda.quantum.db import models
 

setup.py

@@ -18,4 +18,3 @@ setup(
     include_package_data=True,
     zip_safe=False,
 )
-