diff options
Diffstat (limited to 'rebuild-wekan.bat')
| -rw-r--r-- | rebuild-wekan.bat | 3 |
1 files changed, 3 insertions, 0 deletions
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 !!
|