From 5b92f7cbc5095d59da8130246354ff1c11948531 Mon Sep 17 00:00:00 2001
From: Filip Hron <filip.hron@gmail.com>
Date: Thu, 3 Mar 2016 10:15:56 +0100
Subject: [PATCH] putting @overload decorator back to getsockopt method

---
 stdlib/2.7/socket.pyi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/stdlib/2.7/socket.pyi b/stdlib/2.7/socket.pyi
index 2d42323a8..1c0c83396 100644
--- a/stdlib/2.7/socket.pyi
+++ b/stdlib/2.7/socket.pyi
@@ -6,11 +6,7 @@
 # see: http://nullege.com/codes/search/socket
 # adapted for Python 2.7 by Michal Pokorny
 
-<<<<<<< HEAD
 from typing import Any, Tuple, List, Optional, Union, overload
-=======
-from typing import Any, Tuple, List, Optional, Union
->>>>>>> d5cf02390fa2a419a47d8ba7e5d34bf9252989ff
 
 # ----- variables and constants -----