From d70243b4c03719a842f4b1e46e121670175d090d Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 11 Jul 2019 11:08:45 -0700 Subject: [PATCH] leijurv would never do this --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 702af374..db5be4c2 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,7 @@ [![Pull Requests](https://img.shields.io/github/issues-pr/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/pulls/) ![Code size](https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg) ![GitHub repo size](https://img.shields.io/github/repo-size/cabaletta/baritone.svg) -<<<<<<< HEAD -![](https://tokei.rs/b1/github/cabaletta/baritone?category=code) -[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://minecraft.gamepedia.com/1.13.2) -======= ![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code) ->>>>>>> master [![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/) [![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/) [![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.6%20/%20v1.3.2-brightgreen.svg)](https://impactdevelopment.github.io/)