From 8197fbb999529764cecfd3937e32a5f1c602dce3 Mon Sep 17 00:00:00 2001
From: Zachary Lund <admin@computerquip.com>
Date: Fri, 27 Dec 2013 17:09:31 -0600
Subject: [PATCH] Fixed double files, causes issues on Windows

---
 Makefile.am | 1 -
 makefile.am | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 Makefile.am

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 84c8d4029..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
\ No newline at end of file
diff --git a/makefile.am b/makefile.am
index 8c50e095e..20d09245f 100644
--- a/makefile.am
+++ b/makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh COPYING README
 SUBDIRS = libobs libobs-opengl test obs