mirror of
				https://github.com/actions/cache.git
				synced 2025-11-04 03:34:00 +00:00 
			
		
		
		
	My Project
Summery
This commit is contained in:
		
							parent
							
								
									46842ffa66
								
							
						
					
					
						commit
						77bb85fdca
					
				
							
								
								
									
										6
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@ -5,9 +5,15 @@
 | 
				
			|||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
    "@actions/cache": {
 | 
					    "@actions/cache": {
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
      "version": "1.0.7",
 | 
					      "version": "1.0.7",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-1.0.7.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-1.0.7.tgz",
 | 
				
			||||||
      "integrity": "sha512-MY69kxuubqUFq84pFlu8m6Poxl5sR/xyhpC4JEvno7Yg9ASYdGizEmKgt0m8ovewpYKf15UAOcSC0hzS+DuosA==",
 | 
					      "integrity": "sha512-MY69kxuubqUFq84pFlu8m6Poxl5sR/xyhpC4JEvno7Yg9ASYdGizEmKgt0m8ovewpYKf15UAOcSC0hzS+DuosA==",
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					      "version": "1.0.10",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-1.0.10.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-8l9A54RXsPHbHs4Tu0DGqTyE5cguvq3xO9H0ohbLa5zbL2Z4dh9lxnjQn2xojsPQr4WnEVgbaVZpc1tlhehQGw==",
 | 
				
			||||||
 | 
					>>>>>>> parent of b13b69d (Took toolkit changes.)
 | 
				
			||||||
      "requires": {
 | 
					      "requires": {
 | 
				
			||||||
        "@actions/core": "^1.2.6",
 | 
					        "@actions/core": "^1.2.6",
 | 
				
			||||||
        "@actions/exec": "^1.0.1",
 | 
					        "@actions/exec": "^1.0.1",
 | 
				
			||||||
 | 
				
			|||||||
@ -23,7 +23,11 @@
 | 
				
			|||||||
  "author": "GitHub",
 | 
					  "author": "GitHub",
 | 
				
			||||||
  "license": "MIT",
 | 
					  "license": "MIT",
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
    "@actions/cache": "^1.0.7",
 | 
					    "@actions/cache": "^1.0.7",
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					    "@actions/cache": "^1.0.10",
 | 
				
			||||||
 | 
					>>>>>>> parent of b13b69d (Took toolkit changes.)
 | 
				
			||||||
    "@actions/core": "^1.2.6",
 | 
					    "@actions/core": "^1.2.6",
 | 
				
			||||||
    "@actions/exec": "^1.0.1",
 | 
					    "@actions/exec": "^1.0.1",
 | 
				
			||||||
    "@actions/io": "^1.1.0"
 | 
					    "@actions/io": "^1.1.0"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user