From 7709a44520aabdfe4657c0abff3a5acc40bedc0f Mon Sep 17 00:00:00 2001 From: Sven G. Brönstrup Date: Mon, 20 Dec 2021 12:03:05 +0100 Subject: Resolved merge conflict --- lib/Properties.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/Properties.hs b/lib/Properties.hs index 970424a..0eaa245 100644 --- a/lib/Properties.hs +++ b/lib/Properties.hs @@ -227,14 +227,10 @@ checkLayer = do checkObjectProperty :: Object -> Property -> LintWriter Layer checkObjectProperty obj p@(Property name _) = case name of - "url" -> unwrapURI (Proxy @"website") p - (dependsOn . Link) - (const $ forbid "using \"url\" to open local html files is disallowed.") "url" -> do - pure () unwrapURI (Proxy @"website") p (dependsOn . Link) - (dependsOn . Local) + (const $ forbid "using \"url\" to open local html files is disallowed.") unless (objectType obj == "website") $ complain "\"url\" can only be set for objects of type \"website\"" "allowApi" -> forbidProperty name -- cgit v1.2.3