diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /tcpip/ttylinkd.conf | |
parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'tcpip/ttylinkd.conf')
-rw-r--r-- | tcpip/ttylinkd.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tcpip/ttylinkd.conf b/tcpip/ttylinkd.conf index ae65749..8f581ff 100644 --- a/tcpip/ttylinkd.conf +++ b/tcpip/ttylinkd.conf @@ -7,4 +7,3 @@ # sysop=user # sysop=root - |