From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 23 Nov 2019 23:11:48 +0000 (+0100)
Subject: treewide: fix weblate merge conflicts
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5e1253f4f7032e7bdbb106222f2bc2f0760bcb6d;p=project%2Fluci.git

treewide: fix weblate merge conflicts

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

5e1253f4f7032e7bdbb106222f2bc2f0760bcb6d