Unresolved merge conflict

[tobiasriesen]

There are markers of a merge conflict in the code:

• https://github.com/RedPitaya/RedPitaya-FPGA/blob/07f102008aae01c49895ec92adfe467cd1f20288/prj/Examples/make_project.tcl#L8
• https://github.com/RedPitaya/RedPitaya-FPGA/blob/07f102008aae01c49895ec92adfe467cd1f20288/prj/Examples/Frequency_counter/basic_red_pitaya_bd.tcl#L1
• Many others

[Lightsaver7]

Thank you for the note. It will be fixed.

[Lightsaver7]

I opened the pull request to fix the issue and will contact my colleagues to merge the branch.