From 131d303f785070243f9c2bfb07614e1f79d18cca Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Mon, 9 Jan 2023 17:02:30 +0530
Subject: [PATCH] resolve

---
 .github/workflows/ci.yml | 4 ----
 README.md                | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 147c62b..bdc55d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,11 +16,7 @@ jobs:
           go-version: '^1.19'
 
       - name: Build
-<<<<<<< HEAD
-        run: make
-=======
         run: go build .
->>>>>>> rewrite
   
       - uses: actions/upload-artifact@v3
         if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
diff --git a/README.md b/README.md
index c05da5b..f8cec5b 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ You can download and install a [prebuilt binary here](https://nightly.link/ayn2o
 ```bash
 git clone https://github.com/ayn2op/discordo
 cd discordo
-make build
+go build .
 
 # optional
 sudo mv ./discordo /usr/local/bin