From 44676081ddcb5600d45c19a5081d951ca43ded69 Mon Sep 17 00:00:00 2001
From: sbwml <984419930@qq.com>
Date: Tue, 28 Jun 2022 09:00:25 +0800
Subject: [PATCH] fix merge

---
 luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua b/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua
index f08cce5..9007c10 100755
--- a/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua
+++ b/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua
@@ -21,7 +21,6 @@ s = m:section(TypedSection, "global", translate("Basic Settings"))
 s:option(Flag, "enable", translate("Enable App Filter"),translate(""))
 s.anonymous = true
 
->>>>>>> 7d4b72fd04bd41c8d74366cd75354610855be9a6
 s=m:section(TypedSection,"time",translate("Time Setting")) s.anonymous = true
 hv = s:option(Value, "start_time", translate("Start Time")) hv.default="00:00"
 hv.optional=false