fix: ci yaml error

2020-10-09 00:46:52 +02:00 · 2020-10-09 00:46:52 +02:00 · d5eb7fda02
commit d5eb7fda02
parent 35e8ac9c33
2 changed files with 2 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,9 +1,8 @@
 stages:
  - test
  - build
-  # - deploy
+

 include:
  - local: .gitlab/ci/test.gitlab-ci.yml
  - local: .gitlab/ci/build.gitlab-ci.yml
-  - local: .gitlab/ci/deploy.gitlab-ci.yml
--- a/multi_user/bl_types/bl_datablock.py
+++ b/multi_user/bl_types/bl_datablock.py
@ -128,7 +128,7 @@ class BlDatablock(ReplicatedDatablock):
        if instance and hasattr(instance, 'uuid'):
            instance.uuid = self.uuid

-        self.diff_method = DIFF_BINARY
+        # self.diff_method = DIFF_BINARY

    def resolve(self):
        datablock_ref = None