From 0b6252a0753fa2ed75ced6cc475e48f8ffeb242a Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Thu, 22 Feb 2018 21:32:56 +0100
Subject: [PATCH] Merge branch 'master' of
https://sissource.ethz.ch/sispub/openbis
Conflicts:
openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
---
.../cisd/openbis/public/resources/api/v3/openbis.js | 7 -------
1 file changed, 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
index 54b99d30d62..3cc0cb18884 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
@@ -537,8 +537,6 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
}
});
}
-<<<<<<< HEAD
-=======
this.createPlugins = function(creations) {
var thisFacade = this;
@@ -554,7 +552,6 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
}
});
}
->>>>>>> branch 'master' of https://sissource.ethz.ch/sispub/openbis
this.createVocabularies = function(creations) {
var thisFacade = this;
@@ -985,9 +982,6 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
}
});
}
-<<<<<<< HEAD
-
-=======
this.getPlugins = function(ids, fetchOptions) {
var thisFacade = this;
@@ -1004,7 +998,6 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
});
}
->>>>>>> branch 'master' of https://sissource.ethz.ch/sispub/openbis
this.getVocabularies = function(ids, fetchOptions) {
var thisFacade = this;
return thisFacade._private.ajaxRequest({
--
GitLab