source: tags/20060223/subversion/conflict.fig @ 90

Last change on this file since 90 was 39, checked in by nanardon, 18 years ago
  • add conflict slide
File size: 4.1 KB
Line 
1#FIG 3.2  Produced by xfig version 3.2.5-alpha5
2Landscape
3Center
4Inches
5Letter 
6100.00
7Single
8-2
91200 2
100 32 #9e0000
110 33 #9e0000
120 34 #8e8e8e
130 35 #414141
140 36 #8e8e8e
150 37 #414141
160 38 #8e8e8e
170 39 #414141
180 40 #8e8e8e
190 41 #414141
200 42 #8e8e8e
210 43 #414141
220 44 #8e8e8e
230 45 #414141
240 46 #8e8e8e
250 47 #414141
260 48 #8e8e8e
270 49 #414141
280 50 #8e8e8e
290 51 #414141
300 52 #8e8e8e
310 53 #414141
320 54 #8e8e8e
330 55 #414141
340 56 #8e8e8e
350 57 #414141
360 58 #8e8e8e
370 59 #414141
380 60 #8e8e8e
390 61 #414141
400 62 #8e8e8e
410 63 #414141
420 64 #8e8e8e
430 65 #414141
440 66 #8e8e8e
450 67 #414141
460 68 #c7cbc7
470 69 #dfdbdf
480 70 #f7f3f7
490 71 #bec3be
500 72 #696d69
510 73 #bec3be
520 74 #696d69
530 75 #494549
540 76 #8e8e8e
550 77 #696d69
560 78 #8e8e8e
570 79 #717171
580 80 #aeaeae
590 81 #303030
600 82 #969296
610 83 #717171
620 84 #595559
630 85 #aeb2ae
640 86 #bec3be
650 87 #494549
660 88 #696d69
670 89 #494549
680 90 #696d69
690 91 #bec3be
700 92 #696d69
710 93 #494549
720 94 #bec3be
730 95 #696d69
740 96 #bec3be
750 97 #494549
760 98 #8e8e8e
770 99 #dfe3ef
780 100 #96969e
790 101 #d7dbd7
800 102 #9ea2b6
810 103 #9e0000
820 104 #efefef
830 105 #dfe3df
840 106 #86aeff
850 107 #7171ff
860 108 #cfcfcf
870 109 #414541
880 110 #868286
890 111 #bec3be
900 112 #bec3be
910 113 #868286
920 114 #868286
930 115 #bec3be
940 116 #c7b696
950 117 #effbff
960 118 #dfcba6
970 119 #414141
980 120 #868286
990 121 #bec3be
1000 122 #dfe3df
1010 123 #8e8e8e
1020 124 #aeaaae
1030 125 #595559
1040 126 #414141
1050 127 #868286
1060 128 #bec3be
1070 129 #868286
1080 130 #bec3be
1090 131 #dfe3df
1100 132 #8e8e8e
1110 133 #8e8e8e
1120 134 #414141
1130 135 #868286
1140 136 #bec3be
1150 137 #dfe3df
1160 138 #414141
1170 139 #868286
1180 140 #bec3be
1190 141 #dfe3df
1200 142 #868286
1210 143 #bec3be
1220 144 #dfe3df
1230 145 #c7b696
1240 146 #effbff
1250 147 #dfcba6
1260 148 #c7b696
1270 149 #effbff
1280 150 #dfcba6
1290 151 #aeaaae
1300 152 #595559
1310 153 #d7d7d7
1320 154 #8e8e8e
1330 155 #414141
1340 156 #868286
1350 157 #bec3be
1360 158 #dfe3df
1370 159 #414141
1380 160 #868286
1390 161 #bec3be
1400 162 #dfe3df
1410 163 #868286
1420 164 #bec3be
1430 165 #dfe3df
1440 166 #414141
1450 167 #868286
1460 168 #bec3be
1470 169 #414141
1480 170 #bec3be
1490 171 #dfe3df
1500 172 #414141
1510 173 #868286
1520 174 #bec3be
1530 175 #8e8e8e
1540 176 #414141
1550 177 #868286
1560 178 #bec3be
1570 179 #dfe3df
1580 180 #414141
1590 181 #868286
1600 182 #bec3be
1610 183 #dfe3df
1620 184 #bebebe
1630 185 #515151
1640 186 #e7e3e7
1650 187 #000049
1660 188 #797979
1670 189 #303430
1680 190 #414141
1690 191 #868286
1700 192 #bec3be
1710 193 #dfe3df
1726 600 300 1425 900
1732 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
174         1425 900 1425 300 600 300 600 900 1425 900
1754 0 0 50 -1 0 12 0.0000 4 135 510 757 675 Rev N\001
176-6
1776 2700 300 3525 900
1782 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
179         3525 900 3525 300 2700 300 2700 900 3525 900
1804 0 0 50 -1 0 12 0.0000 4 135 720 2752 675 Rev N+1\001
181-6
1826 4500 300 5325 900
1832 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
184         5325 900 5325 300 4500 300 4500 900 5325 900
1854 0 0 50 -1 0 12 0.0000 4 135 720 4552 675 Rev N+2\001
186-6
1876 1125 1950 1725 2400
1882 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
189         1725 2400 1725 1950 1125 1950 1125 2400 1725 2400
1904 0 0 50 -1 0 12 0.0000 4 135 180 1350 2250 W\001
191-6
1926 1875 1200 2475 1650
1932 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
194         2475 1650 2475 1200 1875 1200 1875 1650 2475 1650
1954 0 0 50 -1 0 12 0.0000 4 135 180 2100 1500 W\001
196-6
1976 3825 1950 4425 2400
1982 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
199         4425 2400 4425 1950 3825 1950 3825 2400 4425 2400
2004 0 0 50 -1 0 12 0.0000 4 135 180 4050 2250 W\001
201-6
2026 2925 1950 3525 2400
2032 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
204         3525 2400 3525 1950 2925 1950 2925 2400 3525 2400
2054 0 0 50 -1 0 12 0.0000 4 135 180 3150 2250 W\001
206-6
2076 3000 1350 3375 1725
2082 1 0 5 4 7 50 -1 20 0.000 0 0 -1 0 0 13
209         3188 1575 3300 1688 3338 1650 3225 1538 3338 1425 3300 1388
210         3188 1500 3075 1388 3038 1425 3150 1538 3038 1650 3075 1688
211         3188 1575
212-6
2132 1 0 2 0 -1 51 -1 -1 0.000 0 0 -1 1 0 2
214        2 1 1.00 120.00 120.00
215         3150 1800 3300 1125
2162 1 0 2 0 -1 50 -1 -1 0.000 0 0 -1 1 0 2
217        2 1 1.00 120.00 120.00
218         2625 1425 3075 975
2192 1 0 2 0 -1 50 -1 -1 0.000 0 0 -1 1 0 2
220        2 1 1.00 120.00 120.00
221         1200 975 1800 1425
2222 1 0 2 0 -1 50 -1 -1 0.000 0 0 -1 1 0 2
223        2 1 1.00 120.00 120.00
224         1050 1050 1350 1875
2252 1 0 2 0 -1 50 -1 -1 0.000 0 0 -1 1 0 2
226        2 1 1.00 120.00 120.00
227         3450 1125 3975 1800
2282 1 0 2 0 -1 50 -1 -1 0.000 0 0 -1 1 0 2
229        2 1 1.00 120.00 120.00
230         4200 1800 4650 1125
Note: See TracBrowser for help on using the repository browser.