Skip to content

Commit

Permalink
Merge branch 'config' of https://github.com/DoRTaL94/edison into db-s…
Browse files Browse the repository at this point in the history
…upport
  • Loading branch information
DoRTaL94 committed May 2, 2020
2 parents 2acd8a7 + 3345ec0 commit ea6a71a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Vagrant.configure("2") do |config|
end

# Fixes a dhcp configuration conflict of the private network.
# Issue: https://github.com/hashicorp/vagrant/issues/3083
# Issue: https://github.com/hashicorp/vagrant/issues/8878
class VagrantPlugins::ProviderVirtualBox::Action::Network
def dhcp_server_matches_config?(dhcp_server, config)
true
Expand Down
2 changes: 0 additions & 2 deletions edison/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from flask import render_template


# API description in swagger - https://app.swaggerhub.com/apis/DoRTaL94/UserManagment/1.0.0

app = edison.app
db = edison.db

Expand Down

0 comments on commit ea6a71a

Please sign in to comment.