Fix conflicts 🥰
This commit is contained in:
		
							parent
							
								
									62deba6b98
								
							
						
					
					
						commit
						11b78b17b6
					
				
					 1 changed files with 1 additions and 0 deletions
				
			
		
							
								
								
									
										1
									
								
								dwm.c
									
										
									
									
									
								
							
							
						
						
									
										1
									
								
								dwm.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -277,6 +277,7 @@ static void autostart_exec(void);
 | 
			
		|||
 | 
			
		||||
/* variables */
 | 
			
		||||
static const char broken[] = "broken";
 | 
			
		||||
static Systray *systray = NULL;
 | 
			
		||||
static char stext[256];
 | 
			
		||||
static int screen;
 | 
			
		||||
static int sw, sh;           /* X display screen geometry width, height */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue