From b8ae79ed227432c089b266adae95df6752a1f15f Mon Sep 17 00:00:00 2001
From: dickelbeck <Unknown>
Date: Wed, 10 Oct 2007 04:54:38 +0000
Subject: [PATCH] pcbnew's onrightclick behavior

---
 change_log.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/change_log.txt b/change_log.txt
index 41d1dbd5a7..f52abda055 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -19,7 +19,6 @@ email address.
 	cross-probing minor bug solved ( due to last modification): pins/pads not probed
 
 
->>>>>>> .r316
 2007-Oct-08 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
 ================================================================================
 + gerbview