fix merge error

alpheios-project · Feb 1, 2021 · 67c0784 · 67c0784
1 parent 690ee9f
commit 67c0784
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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