#!/bin/sh
# Test for CVS conflicts in our script files

if grep -s '>>>' ../bin/* > /dev/null ; then
  exit 1;
else
  exit 0;
fi
