From: Daniel Axtens <dja@ucc.asn.au>
Date: Fri, 30 Sep 2011 16:51:34 +0000 (+0800)
Subject: dummy commit to try to get merge to work
X-Git-Url: https://git.ucc.asn.au/?p=dja%2Fscandal.git;a=commitdiff_plain;h=2312058a395f4cedf83c5c19434a9c9b400c9e56

dummy commit to try to get merge to work
---

diff --git a/architecture.txt b/architecture.txt
index 95251d3..703d608 100644
--- a/architecture.txt
+++ b/architecture.txt
@@ -33,3 +33,4 @@ Anything we attempt to detect automatically should have the option to set manual
 	* an option to set a default and certain exceptions would be ace.
  - options for final output
  - options to ignore partial products
+ - more debug options