gistfile1.diff

diff --cc masterfiles/config/cfcadence.conf
index afd74f2,e222eaf..0000000
--- a/masterfiles/config/cfcadence.conf
+++ b/masterfiles/config/cfcadence.conf
@@@ -218,6 -217,11 +219,14 @@@ shellcommands
        '/usr/bin/test ! -d /usr/bin/meld-1.5.2 && /usr/bin/wget http\://aptmaster.colo.elex.be/apt/redhat/rhel/tools/meld-1.5.2.tar.bz
        chdir=/tmp useshell=true timeout=1200 umask=022 owner=root group=root inform=true
  
++<<<<<<< HEAD
++=======
+       '/usr/bin/test ! -d /usr/share/tcllib1.14 && /usr/bin/wget http\://aptmaster.colo.elex.be/apt/redhat/rhel/tools/tcllib-1.14.tar
+       chdir=/tmp useshell=true timeout=1200 umask=022 owner=root group=root inform=true
+ 
+ 
+ 
++>>>>>>> DSL CAD 1.3 , RFC-7142