From 67c0784b0a55731c999e3d305f764148047b2f88 Mon Sep 17 00:00:00 2001
From: Bridget Almas <balmsa@gmail.com>
Date: Mon, 1 Feb 2021 12:55:37 -0500
Subject: [PATCH] fix merge error

---
 .../client-adapters/tests/adapters/lexicons/adapter.test.js   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/client-adapters/tests/adapters/lexicons/adapter.test.js b/packages/client-adapters/tests/adapters/lexicons/adapter.test.js
index 3641a5d2c..26c227c0e 100644
--- a/packages/client-adapters/tests/adapters/lexicons/adapter.test.js
+++ b/packages/client-adapters/tests/adapters/lexicons/adapter.test.js
@@ -30,11 +30,7 @@ describe('lexicons/adapter.test.js', () => {
 
     const urlKey = 'https://github.com/alpheios-project/lsj'
 
-<<<<<<< HEAD
-    let url = adapter.config[urlKey].urls.short
-=======
     let url = adapter.config.lexicons[urlKey].urls.short
->>>>>>> production
     let result = await adapter.checkCachedData(url, LexiconsFixture.lexData[url])
 
     url = adapter.config.lexicons[urlKey].urls.index