From 2eadb31a05b73a130164a2a674880bb145de020d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 13 Aug 2016 23:35:56 +0200
Subject: [PATCH] Merge cleanup

---
 indra/newview/llappearancemgr.cpp | 2 --
 indra/newview/lleventpoll.cpp     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index af332e849e..72482cbe66 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -61,8 +61,6 @@
 #include "lleventcoro.h"
 #include "llavatarpropertiesprocessor.h"
 
-#include "llavatarpropertiesprocessor.h"
-
 // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1)
 #include "rlvactions.h"
 #include "rlvhandler.h"
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 26c1d25ad6..0881d9ec3c 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -44,8 +44,6 @@
 
 #include "llsdutil.h" // <FS:ND/> for ll_pretty_print_sd
 
-#include "boost/make_shared.hpp"
-
 namespace LLEventPolling
 {
 namespace Details