김건희 / OSSW_Weather_Briefing

Go to a project
Toggle navigation Toggle navigation pinning
김건희
d4b03008 1 parent 719d6d54

[Update] Conflict Error

Inline Side-by-side
Showing 2 changed files with 0 additions and 4 deletions
This diff could not be displayed because it is too large.
......@@ -10,11 +10,7 @@
"express": "^4.18.1",
"express-session": "^1.17.3",
"http-proxy-middleware": "^2.0.6",
<<<<<<< HEAD
"mongoose": "^6.3.4",
=======
"mongoose": "^6.3.3",
>>>>>>> origin/weather
"nodemon": "^2.0.16",
"react": "^18.1.0",
"react-dom": "^18.1.0",
......