Remove merge conflict messages and temporary fixes

fenix-hub / godot-engine.easy-charts

A Godot Engine addon for plotting general purpose charts. A collection of Control, 2D and 3D Nodes to plot every chart possible.

MIT License

647 stars 48 forks source link

Remove merge conflict messages and temporary fixes #56

Closed Norodix closed 2 years ago

Norodix commented 2 years ago

There were some files in the repository that had merge conflicts in them. I removed and tested these modules and applied the minimal fixes to get them to a working state.

fenix-hub commented 2 years ago

thank you!