From 34d9cfa8ba8465893ec6b2e62d43f26f937c7727 Mon Sep 17 00:00:00 2001
From: Matthias Kramm <kramm@google.com>
Date: Mon, 28 Sep 2015 14:54:58 -0700
Subject: [PATCH] move marshal.pyi into 2and3/

---
 builtins/{2.7 => 2and3}/marshal.pyi |  0
 builtins/3/marshal.pyi              | 15 ---------------
 2 files changed, 15 deletions(-)
 rename builtins/{2.7 => 2and3}/marshal.pyi (100%)
 delete mode 100644 builtins/3/marshal.pyi

diff --git a/builtins/2.7/marshal.pyi b/builtins/2and3/marshal.pyi
similarity index 100%
rename from builtins/2.7/marshal.pyi
rename to builtins/2and3/marshal.pyi
diff --git a/builtins/3/marshal.pyi b/builtins/3/marshal.pyi
deleted file mode 100644
index 1843e91b7..000000000
--- a/builtins/3/marshal.pyi
+++ /dev/null
@@ -1,15 +0,0 @@
-"""Stub file for the 'marshal' module."""
-# This is an autogenerated file. It serves as a starting point
-# for a more precise manual annotation of this module.
-# Feel free to edit the source below, but remove this header when you do.
-
-from typing import Any, List, Tuple, Dict, Generic
-
-def dump(a, b, *args, **kwargs) -> Any: ...
-
-def dumps(a, *args, **kwargs) -> Any: ...
-
-def load(*args, **kwargs) -> Any:
-    raise TypeError()
-
-def loads(a) -> Any: ...