Commit 53f4063d by Bodor Máté

Fix conflict

parents e638f2fd 47d982d5
Pipeline #786 failed with stages
in 28 seconds
......@@ -2,4 +2,4 @@
recircle/db.sqlite3
recircle/clouds.yaml
environment.sh
.idea/
\ No newline at end of file
.idea/
{
"_meta": {
"hash": {
"sha256": "134400991075a84d52a9eeffd14ebe96b1b33fc180b2948203df04c1cdf27990"
},
"pipfile-spec": 6,
"requires": {},
"sources": [
{
"name": "pypi",
"url": "https://pypi.org/simple",
......
Subproject commit 5d4711571dd4cad9cda386b3ed65a802ed143407
Subproject commit abe7a47367d285b98066243cf1f0e9c5454955d2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment