merge conflict
This commit is contained in:
		
						commit
						6022a5d849
					
				
					 1 changed files with 5 additions and 0 deletions
				
			
		| 
						 | 
					@ -6,6 +6,11 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config_version: 2
 | 
					config_version: 2
 | 
				
			||||||
settings:
 | 
					settings:
 | 
				
			||||||
 | 
					  content.geolocation:
 | 
				
			||||||
 | 
					    https://staff.tfcconnection.org: true
 | 
				
			||||||
  content.notifications:
 | 
					  content.notifications:
 | 
				
			||||||
    https://www.reddit.com: false
 | 
					    https://www.reddit.com: false
 | 
				
			||||||
    https://www.tradingview.com: false
 | 
					    https://www.tradingview.com: false
 | 
				
			||||||
 | 
					    https://staff.tfcconnection.org: false
 | 
				
			||||||
 | 
					  content.register_protocol_handler:
 | 
				
			||||||
 | 
					    https://staff.tfcconnection.org: true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue