There was some werid stuff with add_dom went with what looked like the best of the conflicting lines. Merge branch 'master' of git://1.4.7.7/resdb Conflicts: scripts/add_dom

#!/bin/sh

if [ x"$2" = x ]; then
 echo "Usage: $0 <ASN> <owner>" >&2; exit 255
fi

mkdir db/as/$1 || exit 1
echo $2 > db/as/$1/owner