Fix package-lock merge conflicts
This commit is contained in:
		
						commit
						21a3045d23
					
				
							
								
								
									
										64
									
								
								backend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										64
									
								
								backend/package-lock.json
									
									
									
										generated
									
									
									
								
							@ -37,70 +37,6 @@
 | 
			
		||||
        "ts-node": "^10.8.2"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@ampproject/remapping": {
 | 
			
		||||
      "version": "2.2.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
 | 
			
		||||
      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
 | 
			
		||||
      "dev": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "@jridgewell/gen-mapping": "^0.1.0",
 | 
			
		||||
        "@jridgewell/trace-mapping": "^0.3.9"
 | 
			
		||||
      },
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=6.0.0"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@babel/code-frame": {
 | 
			
		||||
      "version": "7.18.6",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
 | 
			
		||||
      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
 | 
			
		||||
      "dev": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "@babel/highlight": "^7.18.6"
 | 
			
		||||
      },
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=6.9.0"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@babel/compat-data": {
 | 
			
		||||
      "version": "7.18.6",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.6.tgz",
 | 
			
		||||
      "integrity": "sha512-tzulrgDT0QD6U7BJ4TKVk2SDDg7wlP39P9yAx1RfLy7vP/7rsDRlWVfbWxElslu56+r7QOhB2NSDsabYYruoZQ==",
 | 
			
		||||
      "dev": true,
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=6.9.0"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@babel/core": {
 | 
			
		||||
      "version": "7.18.6",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz",
 | 
			
		||||
      "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==",
 | 
			
		||||
      "dev": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "@ampproject/remapping": "^2.1.0",
 | 
			
		||||
        "@babel/code-frame": "^7.18.6",
 | 
			
		||||
        "@babel/generator": "^7.18.6",
 | 
			
		||||
        "@babel/helper-compilation-targets": "^7.18.6",
 | 
			
		||||
        "@babel/helper-module-transforms": "^7.18.6",
 | 
			
		||||
        "@babel/helpers": "^7.18.6",
 | 
			
		||||
        "@babel/parser": "^7.18.6",
 | 
			
		||||
        "@babel/template": "^7.18.6",
 | 
			
		||||
        "@babel/traverse": "^7.18.6",
 | 
			
		||||
        "@babel/types": "^7.18.6",
 | 
			
		||||
        "convert-source-map": "^1.7.0",
 | 
			
		||||
        "debug": "^4.1.0",
 | 
			
		||||
        "gensync": "^1.0.0-beta.2",
 | 
			
		||||
        "json5": "^2.2.1",
 | 
			
		||||
        "semver": "^6.3.0"
 | 
			
		||||
      },
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=6.9.0"
 | 
			
		||||
      },
 | 
			
		||||
      "funding": {
 | 
			
		||||
        "type": "opencollective",
 | 
			
		||||
        "url": "https://opencollective.com/babel"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@babel/core/node_modules/debug": {
 | 
			
		||||
      "version": "4.3.4",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user