Resolve Concelier/Excititor merge conflicts
This commit is contained in:
		
							
								
								
									
										9
									
								
								samples/runtime/npm-monorepo/node_modules/@stella/core/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								samples/runtime/npm-monorepo/node_modules/@stella/core/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| { | ||||
|   "name": "@stella/core", | ||||
|   "version": "2.0.0", | ||||
|   "description": "Core services shared by the sample monorepo.", | ||||
|   "dependencies": { | ||||
|     "lodash": "4.17.21" | ||||
|   }, | ||||
|   "license": "Apache-2.0" | ||||
| } | ||||
							
								
								
									
										10
									
								
								samples/runtime/npm-monorepo/node_modules/@stella/web/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								samples/runtime/npm-monorepo/node_modules/@stella/web/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| { | ||||
|   "name": "@stella/web", | ||||
|   "version": "1.5.3", | ||||
|   "description": "Web layer in the sample monorepo.", | ||||
|   "dependencies": { | ||||
|     "@stella/core": "2.0.0", | ||||
|     "rxjs": "7.8.1" | ||||
|   }, | ||||
|   "license": "MIT" | ||||
| } | ||||
							
								
								
									
										6
									
								
								samples/runtime/npm-monorepo/node_modules/lodash/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								samples/runtime/npm-monorepo/node_modules/lodash/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "name": "lodash", | ||||
|   "version": "4.17.21", | ||||
|   "description": "Lodash modular utilities.", | ||||
|   "license": "MIT" | ||||
| } | ||||
							
								
								
									
										6
									
								
								samples/runtime/npm-monorepo/node_modules/rxjs/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								samples/runtime/npm-monorepo/node_modules/rxjs/package.json
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "name": "rxjs", | ||||
|   "version": "7.8.1", | ||||
|   "description": "Reactive Extensions for modern JavaScript.", | ||||
|   "license": "Apache-2.0" | ||||
| } | ||||
		Reference in New Issue
	
	Block a user