Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
zoobot committed Feb 14, 2023
1 parent d858154 commit 6cfd267
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@ const host = {

const port = {
development: 3002,
blue: 3004,
production: 3002,
local: 3002,
dockerlocal: 3002,
}[env];

// this is for whitelisting hosts for cors
const whitelist = [
'https://blue.waterthetrees.com',
'http://localhost:3000',
'http://localhost:3001',
'http://localhost:3004',
Expand Down

0 comments on commit 6cfd267

Please sign in to comment.