From 7b514fb2f9cf65c0fcc6b719d788a20fbad6104f Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sat, 14 Jan 2017 18:19:49 -0800
Subject: Fix merge errors

---
 src/engine/SCons/Tool/ar.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py
index 14910b7..2cd15c8 100644
--- a/src/engine/SCons/Tool/ar.py
+++ b/src/engine/SCons/Tool/ar.py
@@ -48,11 +48,7 @@ def generate(env):
     env['LIBPREFIX']   = 'lib'
     env['LIBSUFFIX']   = '.a'
 
-<<<<<<< working copy
-    if env.get('RANLIB',False) or env.Detect('ranlib'):
-=======
     if env.get('RANLIB',env.Detect('ranlib')) :
->>>>>>> merge rev
         env['RANLIB']      = env.get('RANLIB','ranlib')
         env['RANLIBFLAGS'] = SCons.Util.CLVar('')
         env['RANLIBCOM']   = '$RANLIB $RANLIBFLAGS $TARGET'
-- 
cgit v0.12