gluon-mesh-babel: fix merge conflict
This commit is contained in:
		
							parent
							
								
									a554758192
								
							
						
					
					
						commit
						7891d54602
					
				@ -1,6 +1,7 @@
 | 
			
		||||
#!/usr/bin/lua
 | 
			
		||||
 | 
			
		||||
local uci = require('simple-uci').cursor()
 | 
			
		||||
local site = require "gluon.site"
 | 
			
		||||
 | 
			
		||||
uci:section('firewall', 'rule', 'mesh_babel', {
 | 
			
		||||
	src = 'mesh',
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user