authelia remove old rebased merge issue

Signed-off-by: webbuilder_pel7ppc64lebuilder0 <webbuilder@powerel.org>

SPECS/authelia.spec

@@ -48,16 +48,8 @@ if [ -f cmd/authelia/constants.go ]; then
   sed "s/__BUILD_TAG__/"%{version}"/" -i cmd/authelia/constants.go
   sed "s/__BUILD_COMMIT__/"%{release}"/" -i cmd/authelia/constants.go
 fi
-<<<<<<< HEAD
 sed 's|h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w=|h1:rdFxbxq4QXVZWj0F+e9jqjDkc7dbp97vkRixKo2JR60=|' -i go.sum
 go build -v -tags netgo -trimpath -ldflags "-extldflags -s -w -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -buildid "%{version}" -X 'github.com/authelia/authelia/internal/utils.BuildTag="%{version}"' -X 'github.com/authelia/authelia/internal/utils.BuildState=\"tagged clean\"' -X 'github.com/authelia/authelia/internal/utils.BuildExtra="%{dist}"' -X 'github.com/authelia/authelia/internal/utils.BuildDate="${BUILDATE}"' -X 'github.com/authelia/authelia/internal/utils.BuildCommit="${GITCOMMIT}"' -X 'github.com/authelia/authelia/internal/utils.BuildBranch=\"master\"' -X 'github.com/authelia/authelia/internal/utils.BuildNumber="%{release}"'" -o authelia ./cmd/authelia/
-||||||| parent of 13986e3 (authelia remove old commands)
-#go build -v -tags netgo -ldflags "-extldflags -s -w -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -buildid "%{version}" -X \"github.com/authelia/authelia/internal/utils.BuildTag="%{version}"\" -X \"github.com/authelia/authelia/internal/utils.BuildState=tagged clean\" -X \"github.com/authelia/authelia/internal/utils.BuildExtra="%{dist}"\" -X \"github.com/authelia/authelia/internal/utils.BuildDate="${BUILDDATE}"\" -X \"github.com/authelia/authelia/internal/utils.BuildCommit="${GITCOMMIT}"\" -X \"github.com/authelia/authelia/internal/utils.BuildBranch=master\" -X \"github.com/authelia/authelia/internal/utils.BuildNumber="%{release}"\"" -o authelia ./cmd/authelia/
-go build -v -tags netgo -ldflags "-extldflags -s -w -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -buildid "%{version}" -X 'github.com/authelia/authelia/v4/internal/utils.BuildTag="%{version}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildState=tagged clean' -X 'github.com/authelia/authelia/v4/internal/utils.BuildExtra="%{dist}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildDate="${BUILDDATE}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildCommit="${GITCOMMIT}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildBranch=master' -X 'github.com/authelia/authelia/v4/internal/utils.BuildNumber="%{release}"'" -o authelia ./cmd/authelia/
-#go build -v -tags netgo -trimpath -ldflags "-extldflags -s -w -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -buildid "%{version}" -X \"internal/utils.BuildTag="%{version}"\" -X \"internal/utils.BuildState=tagged clean\" -X \"internal/utils.BuildExtra="%{dist}"\" -X \"internal/utils.BuildDate="${BUILDDATE}"\" -X \"internal/utils.BuildCommit="${GITCOMMIT}"\" -X \"internal/utils.BuildBranch=master\" -X \"internal/utils.BuildNumber="%{release}"\"" -o authelia ./cmd/authelia/
-=======
-go build -v -tags netgo -ldflags "-extldflags -s -w -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -buildid "%{version}" -X 'github.com/authelia/authelia/v4/internal/utils.BuildTag="%{version}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildState=tagged clean' -X 'github.com/authelia/authelia/v4/internal/utils.BuildExtra="%{dist}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildDate="${BUILDDATE}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildCommit="${GITCOMMIT}"' -X 'github.com/authelia/authelia/v4/internal/utils.BuildBranch=master' -X 'github.com/authelia/authelia/v4/internal/utils.BuildNumber="%{release}"'" -o authelia ./cmd/authelia/
->>>>>>> 13986e3 (authelia remove old commands)
 
 
 %install