Fix merge conflict

src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js

@@ -77,8 +77,8 @@ Use this directive to render a button with a dropdown of alternative actions.
 @param {object} defaultButton The model of the default button.
 @param {array} subButtons Array of sub buttons.
 @param {string=} state Set a progress state on the button (init, busy, success, error).
-@param {string=} direction Set the direction of the drop down (up, down).
-@param {string=} float Set the float of the drop down. (left, right).
+@param {string=} direction Set the direction of the dropdown (up, down).
+@param {string=} float Set the float of the dropdown. (left, right).
 **/
 
 (function() {

src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js

@@ -1,13 +1,8 @@
 /**
-<<<<<<< HEAD
- * @ngdoc directive
- * @name umbraco.directives.directive:headline
- **/
-=======
 * @ngdoc directive
 * @name umbraco.directives.directive:hotkey
 **/
->>>>>>> fix broken directives overview + set marker on deprecated directives
+
 angular.module("umbraco.directives")
     .directive('hotkey', function($window, keyboardService, $log) {
 

src/Umbraco.Web.UI.Client/src/common/directives/components/forms/preventdefault.directive.js

@@ -1,13 +1,23 @@
 /**
-* @ngdoc directive
-* @name umbraco.directives.directive:preventDefault
+@ngdoc directive
+@name umbraco.directives.directive:preventDefault
+
+@description
+Use this directive to prevent default action of an element. Effectively implementing <a href="https://api.jquery.com/event.preventdefault/">jQuery's preventdefault</a>
+
+<h3>Markup example</h3>
+
+<pre>
+    <a href="https://umbraco.com" prevent-default>Don't go to Umbraco.com</a>
+</pre>
+
 **/
 angular.module("umbraco.directives")
     .directive('preventDefault', function() {
         return function(scope, element, attrs) {
 
             var enabled = true;
-            //check if there's a value for the attribute, if there is and it's false then we conditionally don't 
+            //check if there's a value for the attribute, if there is and it's false then we conditionally don't
             //prevent default.
             if (attrs.preventDefault) {
                 attrs.$observe("preventDefault", function (newVal) {
@@ -26,4 +36,4 @@ angular.module("umbraco.directives")
                 }
             });
         };
-    });
+    });