[epiphany] Fix build after mishandling merge conflict
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Fix build after mishandling merge conflict
- Date: Sat, 8 Oct 2016 00:35:15 +0000 (UTC)
commit d71e1687953dca9787c3763928a88d7397081b94
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Oct 7 19:33:08 2016 -0500
Fix build after mishandling merge conflict
embed/Makefile.am | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index bc6d4a8..a46a051 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -40,8 +40,6 @@ libephyembed_la_SOURCES = \
ephy-file-monitor.h \
ephy-find-toolbar.c \
ephy-find-toolbar.h \
- ephy-hosts-manager.c \
- ephy-hosts-manager.h \
ephy-notification-container.c \
ephy-notification-container.h \
ephy-view-source-handler.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]