From 54bc277231a6f206b2fc68a985194859fd67f960 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 5 Jan 2009 22:04:56 +1100 Subject: [PATCH] Finish resolving HACKING conflicts. --- HACKING | 7 ------- 1 file changed, 7 deletions(-) diff --git a/HACKING b/HACKING index e5026f14..5ef2401a 100644 --- a/HACKING +++ b/HACKING @@ -1,10 +1,6 @@ == Coding Style == -<<<<<<< HEAD:HACKING -In general: Just look at other source code! -======= In general: Just look at the existing source code! ->>>>>>> Add a couple of points to the style guide.:HACKING We try to be quite consistent, but of course, that's not always possible. === The most important style issues are: === @@ -51,7 +47,6 @@ We try to be quite consistent, but of course, that's not always possible. * Use UNIX new lines (\n), not windows (\r\n) or old Mac ones (\r) -<<<<<<< HEAD:HACKING == TESTING/OPTIMIZATION == TODO: Add some information here about testing/validation/etc. @@ -59,5 +54,3 @@ Information about how/when to use :regressions might be nice. Additionally, maybe there should be some benchmark information here -- something to let a developer know what's "too" slow...? Or general guidelines about optimization? -======= ->>>>>>> Add a couple of points to the style guide.:HACKING