Skip to content
Snippets Groups Projects
Commit eedbc2b5 authored by Alex Smith's avatar Alex Smith Committed by Michael Niedermayer
Browse files

tools: Fix apparent merge failure

parent 56f17407
No related branches found
No related tags found
No related merge requests found
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <unistd.h>
#include "config.h" #include "config.h"
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> /* getopt */ #include <unistd.h> /* getopt */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment