Resolved merge mess

2020-10-09 22:02:01 +02:00
parent 74dac57258
commit fdde3273e8
4 changed files with 1396 additions and 3015 deletions
@@ -209,6 +209,7 @@
    <property xil_pn:name="WYSIWYG" xil_pn:value="None" xil_pn:valueState="default"/>
    <property xil_pn:name="Working Directory" xil_pn:value="." xil_pn:valueState="non-default"/>
    <property xil_pn:name="XOR Preserve" xil_pn:value="true" xil_pn:valueState="default"/>
+    <property xil_pn:name="iMPACT Project File" xil_pn:value="ZORO_LAN_IDE_Z2.ipf" xil_pn:valueState="non-default"/>
    <!--                                                                                  -->
    <!-- The following properties are for internal use only. These should not be modified.-->
    <!--                                                                                  -->