conflict merge

92840b22 · Alexandra Rogova · 68798710 · 9c2acd43 · 92840b22
Commit 92840b22 authored Jul 29, 2019 by Alexandra Rogova
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

test/tests.html test/tests.html +2 -2

No files found.
--- a/test/tests.html
+++ b/test/tests.html
@@ -29,8 +29,8 @@ See https://www.nexedi.com/licensing for rationale and options.
  <script src="../external/qunit.js" type="text/javascript"></script>
  <script src="../external/sinon.js" type="text/javascript"></script>
-  <script src ="../external/elasticlunr.js"></script>
+  <!--<script src ="./elasticlunr.js"></script>
-  <script src="../src/jio.storage/elasticlunrstorage.js"></script>
+  <script src="./elasticlunrstorage.js"></script>-->
  <script>
    QUnit.config.testTimeout = 5000;