Commit 3979931e authored by Kulpybaev Ilyas's avatar Kulpybaev Ilyas

Merge branch 'master' into test1

# Conflicts:
#	backend/index.ts
parents d93660ea b2d4e6aa
...@@ -7,5 +7,6 @@ const app = express(); ...@@ -7,5 +7,6 @@ const app = express();
app.use(cors()); app.use(cors());
app.listen(PORT); app.listen(PORT);
console.log('dev changes');
console.log('test1'); console.log('test1');
console.log('Server running at port ', PORT); console.log('Server running at port ', PORT);
\ No newline at end of file
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 to comment