solve conflicts

CarlaCostea · CarlaCostea · commit 6311ecec166d · 2021-10-04T12:32:50.000+03:00
diff --git a/src/literal/index.ts b/src/literal/index.ts
@@ -31,9 +31,5 @@ export const isMathEqual = (a: MathNode, b: MathNode, opts: LiteralOpts) => {
     b = sort(b);
   }
 
-<<<<<<< HEAD
   return a.equals(b);
-=======
-  return a.equals(b)
->>>>>>> master
 };

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,5 @@ export const isMathEqual = (a: MathNode, b: MathNode, opts: LiteralOpts) => {`
`31`	`31`	`b = sort(b);`
`32`	`32`	`}`
`33`	`33`
`34`		`-<<<<<<< HEAD`
`35`	`34`	`return a.equals(b);`
`36`		`-=======`
`37`		`- return a.equals(b)`
`38`		`->>>>>>> master`
`39`	`35`	`};`