Permalink
Browse files

Resolved merge conflict

  • Loading branch information...
antwal committed Oct 22, 2018
1 parent cb0d1c1 commit d946034aa12afa1e21daefeb57fd0958b75c6117
Showing with 5 additions and 19 deletions.
  1. +4 −0 README.markdown
  2. +1 −1 configure.ac
  3. +0 −3 src/autologin.c
  4. +0 −3 src/macping.c
  5. +0 −3 src/mactelnet.c
  6. +0 −3 src/mactelnetd.c
  7. +0 −3 src/mndp.c
  8. +0 −3 src/protocol.c
@@ -20,6 +20,10 @@ Note that Docker runs containers on isolated internal networks by default. [`--n
See [Usage](#usage) for more.
### CentOS 7 ###
Testing...
### Linux / kfreebsd ###
Dependencies: gcc (or similar), automake, autoconf
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
AC_INIT(mactelnet, 0.4.5, haakon.nessjoen@gmail.com)
AC_INIT(mactelnet, 0.4.4, haakon.nessjoen@gmail.com)
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([src/mactelnet.c])
AC_CONFIG_HEADERS([src/config.h])
@@ -25,10 +25,7 @@
#include <errno.h>
#include <unistd.h>
#include <config.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "autologin.h"
#include "extra.h"
@@ -40,10 +40,7 @@
#include <stdio.h>
#include <float.h>
#include <config.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "protocol.h"
#include "interfaces.h"
#include "utlist.h"
@@ -53,10 +53,7 @@
#include <sys/mman.h>
#endif
#include <config.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "md5.h"
#include "protocol.h"
#include "console.h"
@@ -78,10 +78,7 @@
#endif
#include <syslog.h>
#include <sys/utsname.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "md5.h"
#include "protocol.h"
#include "console.h"
@@ -34,10 +34,7 @@
#include <arpa/inet.h>
#include <string.h>
#include <config.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "protocol.h"
#include "extra.h"
@@ -46,10 +46,7 @@
#include <endian.h>
#endif
#include <config.h>
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#include "protocol.h"
#include "extra.h"

0 comments on commit d946034

Please sign in to comment.