diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /hash/m5_cass.xml | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/m5_cass.xml')
-rw-r--r-- | hash/m5_cass.xml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/hash/m5_cass.xml b/hash/m5_cass.xml index 8c7569197a6..122c0488f35 100644 --- a/hash/m5_cass.xml +++ b/hash/m5_cass.xml @@ -14,7 +14,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3840"> @@ -28,7 +28,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3386"> @@ -54,7 +54,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="19071"> @@ -68,7 +68,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="16980"> @@ -82,7 +82,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3767"> @@ -108,7 +108,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="8537"> @@ -122,7 +122,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="19184"> @@ -136,7 +136,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="4744"> @@ -150,7 +150,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3423"> @@ -164,7 +164,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3244"> @@ -178,7 +178,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3628"> @@ -192,7 +192,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="5207"> @@ -206,7 +206,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3213"> @@ -272,7 +272,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3278"> @@ -286,7 +286,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="3568"> @@ -300,7 +300,7 @@ <year>19??</year> <publisher><unknown></publisher> <info name="usage" value="Mount together with "BASIC-I" and load with CHAIN"/> - <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> + <!--<sharedfeat name="requirement" value="m5_cart:basici"/>--> <part name="cass1" interface="m5_cass"> <dataarea name="cass" size="4108"> |