From 57ed5ba6f2ade1a8cf7c4b83c0ec00ce56b00ffd Mon Sep 17 00:00:00 2001
From: Tom Igoe <tigoe@tigoemac.itp.tsoa.nyu.edu>
Date: Tue, 12 Jun 2012 10:23:19 -0400
Subject: [PATCH] Reconciled comment versions on TonePitchFollower example

---
 .../02.Digital/tonePitchFollower/tonePitchFollower.ino       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino b/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
index f92607a3c..e74c7b343 100644
--- a/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
+++ b/build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
@@ -9,13 +9,8 @@
  * 4.7K resistor on analog 0 to ground
  
  created 21 Jan 2010
-<<<<<<< HEAD:build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.ino
- modified 9 Apr 2012
- by Tom Igoe 
-=======
  modified 31 May 2012
  by Tom Igoe, with suggestion from Michael Flynn
->>>>>>> Made changes to TonePitchFollower example for clarity, suggestions by user Michael Flynn:build/shared/examples/2.Digital/tonePitchFollower/tonePitchFollower.ino
 
 This example code is in the public domain.