alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rebase master onto java-maven-runtime

Browse Source
This commit is contained in:
Mukhtar Haji
2017-06-26 11:31:07 +01:00
parent 55c2aaf28b
commit 190af3fddd
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fn/langs/base.go
View File

@@ -66,7 +66,6 @@ type LangHelper interface {
type BaseHelper struct {
}
<<<<<<< 1918edacff928f017aa215c925d1e454c43f6320
func (h *BaseHelper) BuildFromImage() string { return "" }
func (h *BaseHelper) RunFromImage() string { return h.BuildFromImage() }
func (h *BaseHelper) IsMultiStage() bool { return true }
@@ -79,11 +78,6 @@ func (h *BaseHelper) PreBuild() error { return nil }
func (h *BaseHelper) AfterBuild() error { return nil }
func (h *BaseHelper) HasBoilerplate() bool { return false }
func (h *BaseHelper) GenerateBoilerplate() error { return nil }
=======
func (h *BaseHelper) Cmd() string { return "" }
func (h *BaseHelper) HasBoilerplate() bool { return false }
func (h *BaseHelper) GenerateBoilerplate() error { return nil }
>>>>>>> Revert "Build project/func on host machine for java-maven"
// exists checks if a file exists
func exists(name string) bool {