From 0a3a1d02a6988691085df48a4c2caaecec2ab728 Mon Sep 17 00:00:00 2001
From: Kyle Kress <kkress@tombras.com>
Date: Thu, 29 Jan 2015 10:51:36 -0500
Subject: [PATCH] Fixed merge

---
 share/apps.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 share/apps.json

diff --git a/share/apps.json b/share/apps.json
old mode 100644
new mode 100755