fix: merge conflicts

htmlhint · May 16, 2020 · 4d904f6 · 4d904f6
1 parent 7a7b26a
commit 4d904f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/rules/attr-no-unnecessary-whitespace.js b/src/rules/attr-no-unnecessary-whitespace.js
@@ -1,4 +1,4 @@
-HTMLHint.addRule({
+export default {
     id: 'attr-no-unnecessary-whitespace',
     description: 'No spaces between attribute names and values.',
     init: function (parser, reporter, options) {
@@ -20,4 +20,4 @@ HTMLHint.addRule({
             }
         });
     }
-});
+};
diff --git a/src/rules/index.js b/src/rules/index.js
@@ -27,3 +27,4 @@ export { default as tagnameLowercase } from './tagname-lowercase';
 export { default as tagnameSpecialChars } from './tagname-specialchars';
 export { default as titleRequire } from './title-require';
 export { default as tagsCheck } from './tags-check';
+export { default as attrNoUnnecessaryWhitespace } from './attr-no-unnecessary-whitespace';
diff --git a/test/rules/attr-no-unnecessary-whitespace.js b/test/rules/attr-no-unnecessary-whitespace.js
@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 
-var HTMLHint = require('../../index').HTMLHint;
+var HTMLHint = require('../../dist/htmlhint.js').HTMLHint;
 
 var ruldId = 'attr-no-unnecessary-whitespace',
     ruleOptions = {};