usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [06/35] git commit: Fixes USERGRID-233 which turns out to be a merge problem.
Date Wed, 01 Oct 2014 14:51:42 GMT
Fixes USERGRID-233 which turns out to be a merge problem.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/43b85a61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43b85a61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43b85a61

Branch: refs/heads/two-dot-o-rebuildable-index
Commit: 43b85a618ddef4ca605cb06153f92a55aa34d567
Parents: 4cba3b8
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Sat Sep 27 10:55:42 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Sat Sep 27 10:55:42 2014 -0400

----------------------------------------------------------------------
 portal/js/global/ug-service.js | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/43b85a61/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index f3cba06..db2bfe9 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -550,13 +550,8 @@ AppServices.Services.factory('ug', function(configuration, $rootScope,
utility,
         self.notificationCollection = notifications;
       });
     },
-<<<<<<< HEAD
-    getNotificationReceipts: function (uuid) {
-      this.getCollection('receipts', 'receipts','created desc','notificationUUID='+uuid);
-=======
     getNotificationReceipts: function(uuid) {
       this.getCollection('receipts', 'notifications/' + uuid + '/receipts');
->>>>>>> d972699... fix create collections
       var self = this;
       $rootScope.$on('receipts-received', function(event, receipts) {
         self.receiptsCollection = receipts;


Mime
View raw message