Resolved merge conflict

gowravshekar · Feb 14, 2017 · befe66d · befe66d
2 parents 7556a6a + 57906d4
commit befe66d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/index.js b/index.js
@@ -1 +1 @@
-require("style!css!less!./font-awesome-styles.loader.js!./font-awesome.config.js");
+require("style-loader!css-loader!less-loader!./font-awesome-styles.loader.js!./font-awesome.config.js");