Merge branch 'master' into no-manifests
This commit is contained in:
		
						commit
						8c79100839
					
				
					 50 changed files with 343 additions and 307 deletions
				
			
		|  | @ -1,6 +1,4 @@ | |||
| #ifndef __WORKER_PROTOCOL_H | ||||
| #define __WORKER_PROTOCOL_H | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| namespace nix { | ||||
| 
 | ||||
|  | @ -67,6 +65,3 @@ template<class T> T readStorePaths(Source & from); | |||
| 
 | ||||
|      | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| #endif /* !__WORKER_PROTOCOL_H */ | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue