Unfinished merge conflict committed to codebase

[andstor]

There is an unresolved merge conflict in the post-parser.js file.

tex2max/src/post-parser.js

Lines 176 to 192 in fb50ee0

	<<<<<<< HEAD
	index += length;
	=======
	function parseSet() {
	// Implement sets here
	// handle commas as entities separator within the braces {a, b}
	// Enforce correct number of commas.
	// Only allow period in floats.
	// split items between braces in an array and itterate it, recursively post parce it.
	}
	function parseFloat() {
	let node;
	let float;
	>>>>>>> a9ffa167458e14e413ed0155ccff00296927cdd7

[nicolopinci]

Should have been fixed now