github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase errors

Browse Source
This commit is contained in:
derekwaynecarr
2015-01-28 15:09:42 -05:00
parent 9674f08504
commit 0ff20c84dd
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/types.go
View File

@@ -1133,7 +1133,6 @@ type List struct {
Items []runtime.Object `json:"items"`
}
<<<<<<< HEAD
// A type of object that is limited
type LimitType string

1
pkg/api/v1beta1/types.go
View File

@@ -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

1
pkg/api/v1beta2/types.go
View File

@@ -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

1
pkg/api/v1beta3/types.go
View File

@@ -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