rebase: fix things that I messed up during rebase
This commit is contained in:
		
							parent
							
								
									0fbdb4aad3
								
							
						
					
					
						commit
						0557daaff1
					
				
					 3 changed files with 1362 additions and 12 deletions
				
			
		|  | @ -1,15 +1,7 @@ | |||
| { | ||||
|   config, | ||||
| <<<<<<< HEAD | ||||
|   lib, | ||||
|   namespace, | ||||
| ======= | ||||
|   inputs, | ||||
|   lib, | ||||
|   namespace, | ||||
|   pkgs, | ||||
|   system, | ||||
| >>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config) | ||||
|   ... | ||||
| }: | ||||
| let | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue