From c84be31c37d07cce6f60be7de4a0225b4b5d5128 Mon Sep 17 00:00:00 2001
From: lazysnake <lazysnake@protonmail.com>
Date: Sat, 3 Jul 2021 09:03:47 +0200
Subject: [PATCH] conflict resolution

---
 game/src/cg_gallery.rpy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy
index 7992df1..f252af9 100644
--- a/game/src/cg_gallery.rpy
+++ b/game/src/cg_gallery.rpy
@@ -66,6 +66,7 @@ init python:
 
         # Add each .png to the gallery
         # TODO: make case insensitive
+        galleryItems = []
         for cgFile in listdir(cgDirPath):
             if isfile(join(cgDirPath, cgFile)):
                 if (cgFile[-4:] == '.png'):