김건희 / 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 @@ ...@@ -10,11 +10,7 @@
10 "express": "^4.18.1", 10 "express": "^4.18.1",
11 "express-session": "^1.17.3", 11 "express-session": "^1.17.3",
12 "http-proxy-middleware": "^2.0.6", 12 "http-proxy-middleware": "^2.0.6",
13 -<<<<<<< HEAD
14 "mongoose": "^6.3.4", 13 "mongoose": "^6.3.4",
15 -=======
16 - "mongoose": "^6.3.3",
17 ->>>>>>> origin/weather
18 "nodemon": "^2.0.16", 14 "nodemon": "^2.0.16",
19 "react": "^18.1.0", 15 "react": "^18.1.0",
20 "react-dom": "^18.1.0", 16 "react-dom": "^18.1.0",
......