Index: aktoserial/circuit/ps2toserial.cmp
===================================================================
--- aktoserial/circuit/ps2toserial.cmp	(revision 659bbff06a0d7cc156eb1decf3d25eb45300e698)
+++ aktoserial/circuit/ps2toserial.cmp	(revision d056b2b41f64913b91a5383fd4c05578fda61cd8)
@@ -1,7 +1,3 @@
-<<<<<<< .mine
-Cmp-Mod V01 Created by CvPCB (2010-05-05 BZR 2356)-stable date = 30/07/2010 19:16:19
-=======
-Cmp-Mod V01 Created by CvPCB (2010-05-05 BZR 2356)-stable date = 23/06/2010 13:36:17
->>>>>>> .r2
+Cmp-Mod V01 Created by CvPCB (2010-05-05 BZR 2356)-stable date = 02/08/2010 09:41:52
 
 BeginCmp
@@ -9,5 +5,5 @@
 Reference = C1;
 ValeurCmp = 27pF;
-IdModule  = SM0805;
+IdModule  = SM1206;
 EndCmp
 
@@ -16,5 +12,5 @@
 Reference = C2;
 ValeurCmp = 27pF;
-IdModule  = SM0805;
+IdModule  = SM1206;
 EndCmp
 
@@ -23,5 +19,5 @@
 Reference = C4;
 ValeurCmp = 100nF;
-IdModule  = SM0805;
+IdModule  = SM1206;
 EndCmp
 
@@ -41,5 +37,4 @@
 
 BeginCmp
-<<<<<<< .mine
 TimeStamp = /4C21F044;
 Reference = D3;
@@ -52,24 +47,8 @@
 Reference = D4;
 ValeurCmp = 3.6V;
-IdModule  = SM0805;
+IdModule  = SM1206;
 EndCmp
 
 BeginCmp
-=======
-TimeStamp = /4C21F044;
-Reference = D3;
-ValeurCmp = 3.3V;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4C21F047;
-Reference = D4;
-ValeurCmp = 3.3V;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
->>>>>>> .r2
 TimeStamp = /4C209A59;
 Reference = IC1;
@@ -82,5 +61,5 @@
 Reference = JP1;
 ValeurCmp = FWUP;
-IdModule  = R1;
+IdModule  = SIL-2;
 EndCmp
 
@@ -103,17 +82,4 @@
 Reference = R2;
 ValeurCmp = 470R;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
-<<<<<<< .mine
-TimeStamp = /4C21F015;
-Reference = R4;
-ValeurCmp = 2.2KR;
-IdModule  = SM0805;
-=======
-TimeStamp = /4C21ED9A;
-Reference = R3;
-ValeurCmp = 18KR;
 IdModule  = SM0805;
 EndCmp
@@ -144,35 +110,5 @@
 Reference = R7;
 ValeurCmp = 68R;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4C20B295;
-Reference = SW1;
-ValeurCmp = SW_PUSH;
-IdModule  = PUSH_BUTT_SHAPE1;
->>>>>>> .r2
-EndCmp
-
-BeginCmp
-<<<<<<< .mine
-TimeStamp = /4C21EEDC;
-Reference = R5;
-ValeurCmp = 480R;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4C21EFE5;
-Reference = R6;
-ValeurCmp = 68R;
-IdModule  = SM0805;
-EndCmp
-
-BeginCmp
-TimeStamp = /4C21EFE9;
-Reference = R7;
-ValeurCmp = 68R;
-IdModule  = R4;
+IdModule  = R3;
 EndCmp
 
@@ -192,13 +128,4 @@
 
 BeginCmp
-=======
-TimeStamp = /4C21EF7A;
-Reference = USB1;
-ValeurCmp = CONN_4;
-IdModule  = USB_B;
-EndCmp
-
-BeginCmp
->>>>>>> .r2
 TimeStamp = /4C20AD34;
 Reference = X1;
Index: aktoserial/circuit/ps2toserial.net
===================================================================
--- aktoserial/circuit/ps2toserial.net	(revision 659bbff06a0d7cc156eb1decf3d25eb45300e698)
+++ aktoserial/circuit/ps2toserial.net	(revision d056b2b41f64913b91a5383fd4c05578fda61cd8)
@@ -1,87 +1,32 @@
-<<<<<<< .mine
-# EESchema Netlist Version 1.1 created  30/07/2010 19:16:19
-=======
-# EESchema Netlist Version 1.1 created  23/06/2010 13:36:17
->>>>>>> .r2
+# EESchema Netlist Version 1.1 created  02/08/2010 09:41:52
 (
-<<<<<<< .mine
- ( /4C20AD6D SM0805 C1 27pF
+ ( /4C20AD6D SM1206 C1 27pF
   ( 1 N-000003 )
   ( 2 GND )
-=======
- ( /4C20AD6D SM0805 C1 27pF
-  ( 1 N-000002 )
-  ( 2 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
- ( /4C20AD73 SM0805 C2 27pF
+ )
+ ( /4C20AD73 SM1206 C2 27pF
   ( 1 N-000004 )
   ( 2 GND )
-=======
- ( /4C20AD73 SM0805 C2 27pF
-  ( 1 N-000022 )
-  ( 2 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
- ( /4C20B56F SM0805 C4 100nF
+ )
+ ( /4C20B56F SM1206 C4 100nF
   ( 1 GND )
   ( 2 +5V )
-=======
- ( /4C20B25A SM0805 C3 100nF
-  ( 1 N-000001 )
-  ( 2 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C52C709 C1V7 C5 10µF
   ( 1 +5V )
   ( 2 GND )
-=======
- ( /4C20B56F SM0805 C4 100nF
-  ( 1 GND )
-  ( 2 +5V )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C20B393 LED-0805 D2 LED
   ( 1 N-000002 )
   ( 2 GND )
-=======
- ( /4C209C03 HE10-10d CON_PROG1 HE10
-  ( 1 N-000017 )
-  ( 2 +5V )
-  ( 3 ? )
-  ( 4 GND )
-  ( 5 N-000001 )
-  ( 6 GND )
-  ( 7 N-000021 )
-  ( 8 GND )
-  ( 9 N-000019 )
-  ( 10 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C21F044 D3 D3 3.6V
   ( 1 GND )
   ( 2 N-000005 )
-=======
- ( /4C20B276 SM0805 D1 DIODE
-  ( 1 N-000001 )
-  ( 2 +5V )
->>>>>>> .r2
- )
-<<<<<<< .mine
- ( /4C21F047 SM0805 D4 3.6V
+ )
+ ( /4C21F047 SM1206 D4 3.6V
   ( 1 GND )
   ( 2 N-000030 )
-=======
- ( /4C20B393 LED-0805 D2 LED
-  ( 1 N-000005 )
-  ( 2 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C209A59 DIP-28__300 IC1 ATMEGA8-P
   ( 1 N-000031 )
@@ -113,21 +58,9 @@
   ( 27 ? )
   ( 28 ? )
-=======
- ( /4C21F044 SM0805 D3 3.3V
-  ( 1 GND )
-  ( 2 N-000031 )
->>>>>>> .r2
- )
-<<<<<<< .mine
- ( /4C5307D0 R1 JP1 FWUP
+ )
+ ( /4C5307D0 SIL-2 JP1 FWUP
   ( 1 N-000029 )
   ( 2 GND )
-=======
- ( /4C21F047 SM0805 D4 3.3V
-  ( 1 GND )
-  ( 2 N-000030 )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C20A3B4 Mini_din6 PS2 CONN_6
   ( 1 N-000023 )
@@ -137,88 +70,26 @@
   ( 5 ? )
   ( 6 +5V )
-=======
- ( /4C209A59 DIP-28__300 IC1 ATMEGA8-P
-  ( 1 N-000001 )
-  ( 2 N-000003 )
-  ( 3 N-000004 )
-  ( 4 N-000006 )
-  ( 5 N-000029 )
-  ( 6 N-000023 )
-  ( 7 +5V )
-  ( 8 GND )
-  ( 9 N-000002 )
-  ( 10 N-000022 )
-  ( 11 N-000007 )
-  ( 12 N-000008 )
-  ( 13 ? )
-  ( 14 ? )
-  ( 15 ? )
-  ( 16 ? )
-  ( 17 N-000017 )
-  ( 18 N-000019 )
-  ( 19 N-000021 )
-  ( 20 +5V )
-  ( 21 +5V )
-  ( 22 GND )
-  ( 23 ? )
-  ( 24 ? )
-  ( 25 ? )
-  ( 26 ? )
-  ( 27 ? )
-  ( 28 ? )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C20B267 SM0805 R1 10K
   ( 1 N-000031 )
   ( 2 +5V )
-=======
- ( /4C20B6CD CONN_UART P1 CONN_4
-  ( 1 N-000004 )
-  ( 2 N-000003 )
-  ( 3 +5V )
-  ( 4 GND )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C20B383 SM0805 R2 470R
   ( 1 N-000009 )
   ( 2 N-000002 )
-=======
- ( /4C20A3B4 Mini_din6 PS2 CONN_6
-  ( 1 N-000023 )
-  ( 2 ? )
-  ( 3 GND )
-  ( 4 +5V )
-  ( 5 N-000029 )
-  ( 6 ? )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C21F015 SM0805 R4 2.2KR
   ( 1 +5V )
   ( 2 N-000005 )
-=======
- ( /4C20B267 SM0805 R1 10K
-  ( 1 N-000001 )
-  ( 2 +5V )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C21EEDC SM0805 R5 480R
   ( 1 N-000023 )
   ( 2 +5V )
-=======
- ( /4C20B383 SM0805 R2 470R
-  ( 1 N-000008 )
-  ( 2 N-000005 )
->>>>>>> .r2
- )
-<<<<<<< .mine
+ )
  ( /4C21EFE5 SM0805 R6 68R
   ( 1 N-000005 )
   ( 2 N-000006 )
  )
- ( /4C21EFE9 R4 R7 68R
+ ( /4C21EFE9 R3 R7 68R
   ( 1 N-000030 )
   ( 2 N-000007 )
@@ -238,44 +109,7 @@
   ( 2 N-000004 )
  )
-=======
- ( /4C21ED9A SM0805 R3 18KR
-  ( 1 N-000003 )
-  ( 2 +5V )
- )
- ( /4C21F015 SM0805 R4 2.2KR
-  ( 1 +5V )
-  ( 2 N-000031 )
- )
- ( /4C21EEDC SM0805 R5 480R
-  ( 1 +5V )
-  ( 2 N-000029 )
- )
- ( /4C21EFE5 SM0805 R6 68R
-  ( 1 N-000031 )
-  ( 2 N-000007 )
- )
- ( /4C21EFE9 SM0805 R7 68R
-  ( 1 N-000030 )
-  ( 2 N-000006 )
- )
- ( /4C20B295 PUSH_BUTT_SHAPE1 SW1 SW_PUSH
-  ( 1 GND )
-  ( 2 N-000001 )
- )
- ( /4C21EF7A USB_B USB1 CONN_4
-  ( 1 +5V )
-  ( 2 N-000031 )
-  ( 3 N-000030 )
-  ( 4 GND )
- )
- ( /4C20AD34 Q_49U3HMS X1 16MHz
-  ( 1 N-000002 )
-  ( 2 N-000022 )
- )
->>>>>>> .r2
 )
 *
 { Allowed footprints by component:
-<<<<<<< .mine
 $component C1
  SM*
@@ -288,37 +122,13 @@
  C1-1
 $endlist
-=======
-$component C1
+$component C4
  SM*
  C?
  C1-1
 $endlist
-$component C2
- SM*
- C?
- C1-1
-$endlist
-$component C3
- SM*
- C?
- C1-1
-$endlist
->>>>>>> .r2
-$component C4
- SM*
- C?
- C1-1
-$endlist
-<<<<<<< .mine
 $component C5
  CP*
  SM*
 $endlist
-=======
-$component D1
- D?
- S*
-$endlist
->>>>>>> .r2
 $component D2
  LED-3MM
@@ -358,5 +168,4 @@
  SM1206
 $endlist
-<<<<<<< .mine
 $component R4
  R?
@@ -365,25 +174,12 @@
  R?-*
  SM1206
-=======
-$component R3
- R?
- SM0603
- SM0805
- R?-*
- SM1206
->>>>>>> .r2
-$endlist
-<<<<<<< .mine
+$endlist
 $component R5
-=======
-$component R4
->>>>>>> .r2
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-<<<<<<< .mine
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
 $component R6
  R?
@@ -392,14 +188,5 @@
  R?-*
  SM1206
-=======
-$component R5
- R?
- SM0603
- SM0805
- R?-*
- SM1206
->>>>>>> .r2
-$endlist
-<<<<<<< .mine
+$endlist
 $component R7
  R?
@@ -408,14 +195,5 @@
  R?-*
  SM1206
-=======
-$component R6
- R?
- SM0603
- SM0805
- R?-*
- SM1206
->>>>>>> .r2
-$endlist
-<<<<<<< .mine
+$endlist
 $component R8
  R?
@@ -424,12 +202,4 @@
  R?-*
  SM1206
-=======
-$component R7
- R?
- SM0603
- SM0805
- R?-*
- SM1206
->>>>>>> .r2
 $endlist
 $endfootprintlist
Index: aktoserial/circuit/ps2toserial.pro
===================================================================
--- aktoserial/circuit/ps2toserial.pro	(revision 659bbff06a0d7cc156eb1decf3d25eb45300e698)
+++ aktoserial/circuit/ps2toserial.pro	(revision d056b2b41f64913b91a5383fd4c05578fda61cd8)
@@ -1,7 +1,2 @@
-<<<<<<< .mine
-update=30/07/2010 20:11:18
-=======
-update=12/07/2010 19:07:33
->>>>>>> .r2
 version=1
 last_client=pcbnew
