summaryrefslogtreecommitdiffstats
path: root/rose/rsusers.sh
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2015-05-02 00:19:09 +0200
committerRalf Baechle <ralf@linux-mips.org>2015-05-02 00:19:09 +0200
commit56e847dae8f585254c6b336ea557bd75a0574711 (patch)
tree7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /rose/rsusers.sh
parent62ceba5818d888041adbd466e8c67a8104bcf4fa (diff)
parent67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff)
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts: ax25/axspawn.c
Diffstat (limited to 'rose/rsusers.sh')
-rw-r--r--[-rwxr-xr-x]rose/rsusers.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/rose/rsusers.sh b/rose/rsusers.sh
index 6dff1ce..58b563c 100755..100644
--- a/rose/rsusers.sh
+++ b/rose/rsusers.sh
@@ -125,4 +125,3 @@ fi
read x
exit 0
-