From 7445aa0b32ebd4dc8e118fec8d75622af2d96a7a Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Fri, 1 Jul 2016 15:00:56 +0200
Subject: [PATCH] conflict due to line ending changes

---
 DAMASK_env.bat | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 DAMASK_env.bat

diff --git a/DAMASK_env.bat b/DAMASK_env.bat
new file mode 100644
index 000000000..751237800
--- /dev/null
+++ b/DAMASK_env.bat
@@ -0,0 +1,19 @@
+:: sets up an environment for DAMASK on Windows
+:: usage:  call DAMASK_env.bat
+@echo off
+set LOCATION=%~dp0
+set DAMASK_ROOT=%LOCATION%\DAMASK
+set DAMASK_NUM_THREADS=2
+chcp 1252
+Title Düsseldorf Advanced Materials Simulation Kit - DAMASK, MPIE Düsseldorf
+echo.
+echo Düsseldorf Advanced Materials Simulation Kit - DAMASK
+echo Max-Planck-Institut für Eisenforschung, Düsseldorf
+echo http://damask.mpie.de
+echo.
+echo Preparing environment ...
+echo DAMASK_ROOT=%DAMASK_ROOT%
+echo DAMASK_NUM_THREADS=%DAMASK_NUM_THREADS%
+set DAMASK_BIN=%DAMASK_ROOT%\bin
+set PATH=%PATH%;%DAMASK_BIN%
+set PYTHONPATH=%PYTHONPATH%;%DAMASK_ROOT%\lib