Issue #26: resolve a merge conflict

juspay · Nov 26, 2019 · 56519c2 · 56519c2
2 parents d19fb0a + cb8afc7
commit 56519c2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/Fencer/Rules.hs b/lib/Fencer/Rules.hs
@@ -142,8 +142,14 @@ validatePotentialDomains res = case partitionEithers res of
           (NE.fromList $ sortOn domainDefinitionId domains)
       if (length @[] domains /= length @[] groupedDomains)
       then
-        let dupDomain = NE.head . head $ filter (\l -> NE.length l > 1) groupedDomains
-        in Left . pure . LoadRulesDuplicateDomain . domainDefinitionId $ dupDomain
+        let dupDomain =
+              NE.head . head $ filter (\l -> NE.length l > 1) groupedDomains
+        in
+          Left .
+          pure .
+          LoadRulesDuplicateDomain .
+          domainDefinitionId $
+            dupDomain
       else Right domains
     -- check if there are any duplicate rules
     traverse_ (dupRuleCheck . (\dom -> (domainDefinitionId dom, dom))) domains