From 0ff20c84dd5bd078b308f92a5e27c03e58bb2212 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Wed, 28 Jan 2015 15:09:42 -0500 Subject: [PATCH] Rebase errors --- pkg/api/types.go | 1 - pkg/api/v1beta1/types.go | 1 - pkg/api/v1beta2/types.go | 1 - pkg/api/v1beta3/types.go | 1 - 4 files changed, 4 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 4b81bdca829..ca44d616ed1 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -1133,7 +1133,6 @@ type List struct { Items []runtime.Object `json:"items"` } -<<<<<<< HEAD // A type of object that is limited type LimitType string diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index cfa4b7522dc..650d82b6c63 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -893,7 +893,6 @@ type List struct { Items []runtime.RawExtension `json:"items" description:"list of objects"` } -<<<<<<< HEAD // A type of object that is limited type LimitType string diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index bc8cfd9d172..624bba5b66d 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -895,7 +895,6 @@ type List struct { Items []runtime.RawExtension `json:"items" description:"list of objects"` } -<<<<<<< HEAD // A type of object that is limited type LimitType string diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index c44090e1e1b..f7359ac10a3 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -1055,7 +1055,6 @@ type List struct { Items []runtime.RawExtension `json:"items" description:"list of objects"` } -<<<<<<< HEAD // A type of object that is limited type LimitType string