priyatham
/
Locaft-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge change

This commit is contained in:
Priyatham-sai-chand 2021-04-01 21:31:18 +05:30
parent 13263e7abc 5cf48269df
commit 012dc763e4
2 changed files with 1828 additions and 1602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies # dependencies
@ -27,11 +28,16 @@ yarn-debug.log*
yarn-error.log* yarn-error.log*
client\node_modules client\node_modules
server\node_modules server\node_modules
======= =======
client/node_modules client/node_modules
server/node_modules server/node_modules
>>>>>>> git ignore node modules >>>>>>> git ignore node modules
======= =======
server/node_modules server/node_modules
node_modules node_modules
>>>>>>> ignore server modules >>>>>>> ignore server modules
=======
client/node_modules
server/node_modules
node_modules
>>>>>>> 5cf48269df3d248df82e7fe4752d7e0cde35ca86

3416
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff