diff --git a/ATTAMI-V0.00.brd b/ATTAMI-V0.00.brd index 419eff4..05b2434 100644 --- a/ATTAMI-V0.00.brd +++ b/ATTAMI-V0.00.brd @@ -1,12 +1,12 @@ - + - + @@ -1233,8 +1233,8 @@ design rules under a new name. - - + + @@ -1302,7 +1302,7 @@ design rules under a new name. - + @@ -1342,7 +1342,6 @@ design rules under a new name. -<<<<<<< HEAD @@ -1357,16 +1356,13 @@ design rules under a new name. - -======= - - - - ->>>>>>> master + + + + @@ -1402,28 +1398,33 @@ design rules under a new name. - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + @@ -1431,19 +1432,20 @@ design rules under a new name. - - - - - + + + + + - - - + + + + @@ -1491,7 +1493,7 @@ design rules under a new name. - + @@ -1544,8 +1546,19 @@ design rules under a new name. - - + + + + + + + + + + + + + @@ -1554,6 +1567,11 @@ design rules under a new name. + + + + +