Revert "Revert "resolver""

This reverts commit c309463.

Conflicts:
	swagger_py_codegen/parser.py

swagger_py_codegen/parser.py

@@ -19,8 +19,6 @@ def __init__(self, data, ref):
         self.ref = ref
         self._data = data
 
-<<<<<<< HEAD
-
     def __getitem__(self, key):
         return self._data.__getitem__(key)
 
@@ -29,22 +27,6 @@ def __setitem__(self, key, value):
 
     def __getattr__(self, key):
         return self._data.__getattribute__(key)
-=======
-    def __getitem__(self, key):
-        return self._data.__getitem__(key)
-
-    def __settiem__(self, key, value):
-        return self._data.__settiem__(key, value)
-
-    def get(self, key, default=None):
-        return self._data.get(key, default)
-
-    def has(self, key, default=None):
-        return self._data.has(key)
-
-    def keys(self):
-        return self._data.keys()
->>>>>>> parent of c309463... Revert "resolver"
 
     def __iter__(self):
         return self._data.__iter__()