[icinga-checkins] icinga.org: icinga2/feature/doc-review-11599: Changes hyphens (-) to en dashes (typography)

git at icinga.org git at icinga.org
Fri May 20 14:49:38 CEST 2016


Module: icinga2
Branch: feature/doc-review-11599
Commit: 315abe61b09fb3d6b159787856675f6fe5a3e941
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=315abe61b09fb3d6b159787856675f6fe5a3e941

Author: Heike Jurzik <icinga at huhnix.org>
Date:   Fri Apr 22 16:05:09 2016 +0200

Changes hyphens (-) to en dashes (typography)

refs #11599

---

 doc/3-monitoring-basics.md |    1 +
 doc/bla                    |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/3-monitoring-basics.md b/doc/3-monitoring-basics.md
index bb6589b..5c5e8dd 100644
--- a/doc/3-monitoring-basics.md
+++ b/doc/3-monitoring-basics.md
@@ -1515,6 +1515,7 @@ when passing credentials to database checks:
 ### <a id="notification-commands"></a> Notification Commands
 
 [NotificationCommand](6-object-types.md#objecttype-notificationcommand) objects define how notifications are delivered to external
+<<<<<<< HEAD
 <<<<<<< eb277a669f6f789fe64a3bc101d5c98b9822adf0
 interfaces (email, XMPP, IRC, Twitter, etc.).
 =======
diff --git a/doc/bla b/doc/bla
deleted file mode 100644
index b7d6715..0000000
--- a/doc/bla
+++ /dev/null
@@ -1 +0,0 @@
-FOO



More information about the icinga-checkins mailing list