resolve

.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) }}

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