From 0b00a8095ce34c753e5edac86d4b62e8aaa1b1e0 Mon Sep 17 00:00:00 2001
From: dollybean <herbalproducts.ist@gmail.com>
Date: Tue, 4 Feb 2020 02:28:45 -0800
Subject: Customize of some card's functions

---
 rebuild-wekan.bat | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'rebuild-wekan.bat')

diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat
index 065100e9..4e7efac1 100644
--- a/rebuild-wekan.bat
+++ b/rebuild-wekan.bat
@@ -2,7 +2,10 @@
 
 REM NOTE: You can try this to install Meteor on Windows, it works:
 REM       https://github.com/zodern/windows-meteor-installer/
+<<<<<<< HEAD
 
+=======
+>>>>>>> ac37e360b69b799c12f03e1c158cfc0367d26e55
 REM Installing Meteor with Chocolatey does not currently work.
 
 REM NOTE: THIS .BAT DOES NOT WORK !!
-- 
cgit v1.2.3-1-g7c22