Hi,
        
        
        I installed condor on my local machine:
        
          $CondorVersion: 8.0.1
              Jul 15 2013 BuildID: 148801 $
          $CondorPlatform:
              x86_64_Ubuntu12 $
         
        
        
        but I found an error occur when I tried to submit a job:
        
        
          /usr/bin/condor_qsub:
              line 841: syntax error near unexpected token
              `<<<'
         
        
        
        Actually I see these lines 841-844 on /usr/bin/condor_qsub:
        
          <<<<<<<
              Updated upstream
           mem_value="echo
              $mem_value | tr a-z A-Z"
          =======
          >>>>>>>
              Stashed changes
         
        
        
        I don't know if these lines are actual bash commands or not...
        
          So I tried commenting these lines, but this time it returns
          job assignment numbers but doesn't run my commands:
        
           ID    
               OWNER            SUBMITTED     RUN_TIME ST PRI SIZE CMD  
                         
          
             1.0   skim        
                10/14 12:04   0+00:21:08 R  0   268.6 bash              
             2.0   skim        
                10/14 12:05   0+00:20:37 R  0   268.6 bash              
             3.0   skim        
                10/14 12:07   0+00:18:11 R  0   268.6 bash              
             4.0   skim        
                10/14 12:07   0+00:17:51 R  0   268.6 bash              
          
          
          Thank you for your helps/tips in advance.