-
Notifications
You must be signed in to change notification settings - Fork 0
/
Stripe-merging
70 lines (67 loc) · 2.54 KB
/
Stripe-merging
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Merge branch 'react-express' of https://github.com/dellebew/ESC_Ascenda into react-express
# Conflicts:
# api/app.js
# client/package-lock.json
# client/package.json
# package-lock.json
#
# It looks like you may be committing a merge.
# If this is not correct, please run
# git update-ref -d MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch react-express
# Your branch and 'origin/react-express' have diverged,
# and have 1 and 15 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: README.md
# renamed: .gitignore -> api/.gitignore
# modified: api/controllers/destinationPricesController.js
# modified: api/routes/users.js
# renamed: client/drafts/rooms-sample.json -> client/drafts/room-sample.json
# modified: client/package-lock.json
# modified: client/package.json
# modified: client/public/index.html
# new file: client/public/loader.gif
# modified: client/src/components/header/header.css
# modified: client/src/components/hotelCard/HotelCard.jsx
# deleted: client/src/components/loader/Loader.jsx
# deleted: client/src/components/loader/loader.css
# modified: client/src/components/navbar/navbar.css
# modified: client/src/components/searchBar/SearchBar.jsx
# modified: client/src/components/searchBar/searchBar.css
# modified: client/src/components/utils/useFetch.js
# deleted: client/src/database/MOCK_DATA.json
# new file: client/src/database/countries.json
# new file: client/src/database/destinations.json
# new file: client/src/database/output.json
# modified: client/src/pages/destinations/Destinations.jsx
# modified: client/src/pages/destinations/destinations.css
# modified: client/src/pages/hotels/Hotels.jsx
# modified: client/src/pages/hotels/hotels.css
# deleted: controllers/destinationController.js
# deleted: controllers/destinationPricesController.js
# deleted: controllers/hotelController.js
# deleted: controllers/hotelPriceController.js
# deleted: package.json
# deleted: public/javascripts/dbops.js
# deleted: views/error.jade
# deleted: views/index.jade
# deleted: views/layout.jade
#
# Changes not staged for commit:
# modified: api/package-lock.json
# modified: api/routes/api.js
# modified: client/src/components/hotelPage/HotelPage.jsx
#
# Untracked files:
# client/src/components/payment/.env
# node_modules/
#
W