From 283715df0c471f3fb16e6f240cacd1e36300b4ab Mon Sep 17 00:00:00 2001
From: Will Code <willcode4@gmail.com>
Date: Sat, 13 Oct 2012 20:51:26 -0400
Subject: [PATCH] Update files that got out of sync somehow.

---
 hardware/jawbreaker/baseband.sch         |  8 --------
 hardware/jawbreaker/frontend.sch         |  9 ---------
 hardware/jawbreaker/jawbreaker-cache.lib |  4 ----
 hardware/jawbreaker/jawbreaker.sch       |  8 --------
 hardware/jawbreaker/mcu.sch              | 23 -----------------------
 5 files changed, 52 deletions(-)

diff --git a/hardware/jawbreaker/baseband.sch b/hardware/jawbreaker/baseband.sch
index 7734b22b..208c17c7 100644
--- a/hardware/jawbreaker/baseband.sch
+++ b/hardware/jawbreaker/baseband.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 3 4
 Title "jawbreaker baseband"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/frontend.sch b/hardware/jawbreaker/frontend.sch
index 90ae547c..568a6dc2 100644
--- a/hardware/jawbreaker/frontend.sch
+++ b/hardware/jawbreaker/frontend.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -40,13 +36,8 @@ EELAYER END
 $Descr User 17000 11000
 encoding utf-8
 Sheet 2 4
-<<<<<<< HEAD
-Title ""
-Date "19 sep 2012"
-=======
 Title "jawbreaker frontend"
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/jawbreaker-cache.lib b/hardware/jawbreaker/jawbreaker-cache.lib
index 42bfbf71..fee43e49 100644
--- a/hardware/jawbreaker/jawbreaker-cache.lib
+++ b/hardware/jawbreaker/jawbreaker-cache.lib
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema-LIBRARY Version 2.3  Date: Wed Sep 19 09:57:14 2012
-=======
 EESchema-LIBRARY Version 2.3  Date: Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 #encoding utf-8
 #
 # +1.8V
diff --git a/hardware/jawbreaker/jawbreaker.sch b/hardware/jawbreaker/jawbreaker.sch
index 44ed7607..b4f28787 100644
--- a/hardware/jawbreaker/jawbreaker.sch
+++ b/hardware/jawbreaker/jawbreaker.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 1 4
 Title "jawbreaker"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
diff --git a/hardware/jawbreaker/mcu.sch b/hardware/jawbreaker/mcu.sch
index 81fd81a8..42bdcbb2 100644
--- a/hardware/jawbreaker/mcu.sch
+++ b/hardware/jawbreaker/mcu.sch
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-EESchema Schematic File Version 2  date Wed Sep 19 09:57:14 2012
-=======
 EESchema Schematic File Version 2  date Tue Oct  2 15:08:35 2012
->>>>>>> upstream/master
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -41,11 +37,7 @@ $Descr User 17000 11000
 encoding utf-8
 Sheet 4 4
 Title "jawbreaker mcu/usb/power"
-<<<<<<< HEAD
-Date "19 sep 2012"
-=======
 Date "2 oct 2012"
->>>>>>> upstream/master
 Rev ""
 Comp "Copyright 2012 Michael Ossmann"
 Comment1 "License: GPL v2"
@@ -53,8 +45,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-<<<<<<< HEAD
-=======
 $Comp
 L R R65
 U 1 1 506B55A7
@@ -92,7 +82,6 @@ F 6 "CAP CER 33PF 50V 5% NP0 0402" H 17450 700 60  0001 C CNN "Description"
 	1    14300 900 
 	0    1    1    0   
 $EndComp
->>>>>>> upstream/master
 Wire Wire Line
 	9700 5300 10400 5300
 Wire Wire Line
@@ -2185,18 +2174,6 @@ F 6 "RES 39 OHM 1/16W 5% 0402 SMD" H 9800 9000 60  0001 C CNN "Description"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C125
-U 1 1 503F91B4
-P 14300 900
-F 0 "C125" H 14350 1000 50  0000 L CNN
-F 1 "22pF" H 14350 800 50  0000 L CNN
-F 4 "Murata" H 14300 900 60  0001 C CNN "Manufacturer"
-F 5 "GRM1555C1H220JA01D" H 14300 900 60  0001 C CNN "Part Number"
-F 6 "CAP CER 22PF 50V 5% NP0 0402" H 14300 900 60  0001 C CNN "Description"
-	1    14300 900 
-	0    1    1    0   
-$EndComp
-$Comp
 L R R46
 U 1 1 503F8429
 P 13200 650