From b0fca659c57dd2cb6a88a74d1a349117a3908124 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 8 Jan 2025 03:13:09 -0600 Subject: fix the dumb names --- repo.merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'repo.merge.go') diff --git a/repo.merge.go b/repo.merge.go index 9507459..6dbb35e 100644 --- a/repo.merge.go +++ b/repo.merge.go @@ -18,7 +18,7 @@ func (rs *Repo) MergeUserToDevel() (*cmd.Status, error) { all = append(all, []string{"git", "push"}) if result, err := rs.RunStrictAll(all); err != nil { - log.Log(GITPBWARN, "MergeUserToDevel() failed", rs.GetFullPath()) + log.Log(WARN, "MergeUserToDevel() failed", rs.GetFullPath()) return result, err } return nil, nil @@ -37,7 +37,7 @@ func (rs *Repo) MergeDevelToMaster() (*cmd.Status, error) { all = append(all, []string{"git", "push"}) if result, err := rs.RunStrictAll(all); err != nil { - log.Log(GITPBWARN, "MergeDevelToMaster() failed", rs.GetFullPath()) + log.Log(WARN, "MergeDevelToMaster() failed", rs.GetFullPath()) return result, err } return nil, nil -- cgit v1.2.3