From b685f2805f483c2a0df89695ac7a7f472172debe Mon Sep 17 00:00:00 2001
From: Aidan Hubert <torrinfail@gmail.com>
Date: Wed, 27 Nov 2019 05:50:38 +0000
Subject: Fixed garbled last commit

---
 dwmblocks.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'dwmblocks.c')

diff --git a/dwmblocks.c b/dwmblocks.c
index 3071243..395b565 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -33,10 +33,7 @@ static Window root;
 static char statusbar[LENGTH(blocks)][50] = {0};
 static char statusstr[2][256];
 static int statusContinue = 1;
-<<<<<<< HEAD
 static void (*writestatus) () = setroot;
-=======
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
 
 void replace(char *str, char old, char new)
 {
@@ -99,21 +96,12 @@ void setupsignals()
 int getstatus(char *str, char *last)
 {
 	strcpy(last, str);
-<<<<<<< HEAD
 	str[0] = '\0';
 	for(int i = 0; i < LENGTH(blocks); i++)
-=======
-	int j = 0;
-	for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
 	{	
 		strcat(str, statusbar[i]);
 	}
-<<<<<<< HEAD
 	str[strlen(str)-1] = '\0';
-=======
-	str[--j] = '\0';
->>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
 	return strcmp(str, last);//0 if they are the same
 }
 
-- 
cgit v1.2.3-13-gbd6f