From 457c245fe592120fe74e8946a86db413bb92fa30 Mon Sep 17 00:00:00 2001 From: GME Date: Thu, 14 Mar 2019 22:30:20 +0100 Subject: [PATCH] Auto stash before merge of "develop" and "origin/develop" --- .idea/workspace.xml | 386 ++++++++++++++++++++++++++++++-------------- 1 file changed, 262 insertions(+), 124 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 15eb1b0..adf61d1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,6 +9,7 @@