From 936bb39145eee86530f61d3345f8125ddd778225 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 16:35:07 +0800
Subject: [PATCH] 冲突修正

---
 src/assets/img/logo_30x30.png |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/img/logo_30x30.png b/src/assets/img/logo_30x30.png
index 40a34ca..547aadf 100644
--- a/src/assets/img/logo_30x30.png
+++ b/src/assets/img/logo_30x30.png
Binary files differ

--
Gitblit v1.8.0