.gitignore

@@ -1,35 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-# ---> Go
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-# Go workspace file
-go.work
-
-=======
 .env
 .vscode
 icon.jpg
->>>>>>> beta
-=======
-.env
-.vscode
-icon.jpg
->>>>>>> beta

README.md

@@ -1,3 +0,0 @@
-# MinIO-Share-S3
-
-Share files from your bucket easily: quick share with your friends, get short and readable links to your files and post files and images to your websites