Fix conflict

.gitignore

@@ -2,4 +2,4 @@
 recircle/db.sqlite3
 recircle/db.sqlite3
 recircle/clouds.yaml
 recircle/clouds.yaml
 environment.sh
 environment.sh
-.idea/
+.idea/
\ No newline at end of file

Pipfile.lock

 {
 {
     "_meta": {
     "_meta": {
         "hash": {
         "hash": {
-            "sha256": "134400991075a84d52a9eeffd14ebe96b1b33fc180b2948203df04c1cdf27990"
         },
         },
-        "pipfile-spec": 6,
-        "requires": {},
-        "sources": [
             {
             {
                 "name": "pypi",
                 "name": "pypi",
                 "url": "https://pypi.org/simple",
                 "url": "https://pypi.org/simple",

interface_openstack @ abe7a473

-Subproject commit 5d4711571dd4cad9cda386b3ed65a802ed143407
+Subproject commit abe7a47367d285b98066243cf1f0e9c5454955d2