stupid merge issues

Author: jiegillet

chapters/data_compression/huffman/huffman.md

@@ -1,3 +1,4 @@
+>>>>>>> 6479bd2... Revert "fixed a file for merging"
 # Huffman Encoding
 
 If there were ever a data compression method to take the world by storm, it would be Huffman encoding.
@@ -111,4 +112,3 @@ $$
 \newcommand{\bfomega}{\boldsymbol{\omega}}
 \newcommand{\bftau}{\boldsymbol{\tau}}
 $$
-