Fix conflict

1 files changed, 9 insertions, 0 deletions

diff --git a/bin/test-website b/bin/test-website
index 2585b465..aeab459b 100755
--- a/bin/test-website
+++ b/bin/test-website
@@ -25,6 +25,10 @@ opts = OptionParser.new do |o|
   o.on('-l','--link-checker', 'Check for dead links') do
     options[:link_checker] = true
   end
+  
+  o.on('-n','--navigation-test', 'Check for navigation test results') do
+    options[:navigation_test] = true
+  end
 
   o.separator ""
   o.on_tail('-h', '--help', 'display this help and exit') do
@@ -62,3 +66,8 @@ if options[:link_checker]
 else
   require 'main_web_functionality'
 end
+  
+if options[:navigation_test]
+  require 'NavigationTest'
+end
+