Fix merge mistake; adjust animation timings.

services/web/app/views/project/editor/review-panel.jade

@@ -183,11 +183,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
 					placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
 				)
 			.rp-entry-actions
-<<<<<<< Updated upstream
-				a.rp-entry-button(href, ng-click="onResolve();", ng-if="permissions.comment && permissions.write") 
-=======
-				a.rp-entry-button(href, ng-click="animateAndCallOnResolve();") 
->>>>>>> Stashed changes
+				a.rp-entry-button(href, ng-click="animateAndCallOnResolve();", ng-if="permissions.comment && permissions.write") 
 					i.fa.fa-inbox
 					| &nbsp;Resolve
 				a.rp-entry-button(href, ng-click="onReply();", ng-if="permissions.comment")

services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee

@@ -24,5 +24,5 @@ define [
 			scope.animateAndCallOnResolve = () ->
 				scope.state.animating = true
 				element.find(".rp-entry").css("top", 0)
-				$timeout((() -> scope.onResolve()), 200)
+				$timeout((() -> scope.onResolve()), 350)
 				return true

services/web/public/stylesheets/app/editor/review-panel.less

@@ -263,7 +263,7 @@
 		z-index: 3;
 		transform: scale(.1);
 		transform-origin: 0 0;
-		transition: top .2s ease-out, left .2s ease-out, transform .2s ease-out, opacity .2s ease-out .1s;
+		transition: top .35s ease-out, left .35s ease-out, transform .35s ease-out, opacity .35s ease-out .2s;
 	}
 	
 	&-comment-resolved {
@@ -516,7 +516,7 @@
 }
 
 .rp-comment-wrapper {
-	transition: .2s opacity ease-out;
+	transition: .35s opacity ease-out .2s;
 
 	&-resolving {
 		opacity: 0;