fixed merge conflict
This commit is contained in:
		
							parent
							
								
									1b0435b9a3
								
							
						
					
					
						commit
						8db3faafd5
					
				
					 1 changed files with 0 additions and 1 deletions
				
			
		|  | @ -1,4 +1,3 @@ | |||
| <<<<<<< HEAD | ||||
| # Do not modify this file!  It was generated by ‘nixos-generate-config’ | ||||
| # and may be overwritten by future invocations.  Please make changes | ||||
| # to /etc/nixos/configuration.nix instead. | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue