From f34e2fde7f4e69ec695ed9cb233d7f5b27479c6f Mon Sep 17 00:00:00 2001
From: Marc Huffnagle <marc@element84.com>
Date: Mon, 19 Mar 2018 17:04:04 -0400
Subject: [PATCH] Fix missed merge resolution

---
 .eslint-ratchet-high-water-mark | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslint-ratchet-high-water-mark b/.eslint-ratchet-high-water-mark
index 15475a3d5fc..c7410a5b0a0 100644
--- a/.eslint-ratchet-high-water-mark
+++ b/.eslint-ratchet-high-water-mark
@@ -1 +1 @@
-1667
+1675