From 041b3af18cabc2f376f78bf2a88e0b395fd0a787 Mon Sep 17 00:00:00 2001
From: Andrew Titmuss <andrew@coffeetocode.me>
Date: Fri, 11 Mar 2016 20:58:46 +1100
Subject: [PATCH] fixed merge conflict

---
 1.5.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/1.5.md b/1.5.md
index 00a4bac3..e6d829b2 100644
--- a/1.5.md
+++ b/1.5.md
@@ -11,10 +11,6 @@
 **Disk Usage**<br \>
 - Only display usage of local disks.
 
-**GPU**</br>
-- Add `tiny` option to shorten output of GPU even further.
-- Removes words 'Graphics', 'GeForce' and 'Radeon'
-
 ### Ascii
 
 - Kaos: Update ascii logo to the new logo.