From cdcffbcc3c3c052afdeb772ff0167e7a90b525bb Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Wed, 19 Mar 2014 12:45:55 -0700
Subject: merging javascript branch

---
 cpp/src/Ice/EndpointFactoryManager.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cpp/src/Ice/EndpointFactoryManager.h')

diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h
index 7040fa69eec..b6de8c5d048 100644
--- a/cpp/src/Ice/EndpointFactoryManager.h
+++ b/cpp/src/Ice/EndpointFactoryManager.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -16,7 +16,6 @@
 #include <Ice/EndpointIF.h>
 #include <Ice/EndpointFactoryF.h>
 #include <Ice/EndpointFactoryManagerF.h>
-#include <Ice/Protocol.h>
 
 namespace IceInternal
 {
-- 
cgit v1.2.3