[DOC beta] rfc176 api doc update

emberjs · Jan 29, 2018 · 1255a54 · 1255a54
1 parent f9e1523
commit 1255a54
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -138,7 +138,12 @@ let librariesRegistered = false;
   append views inside it!
 
   To learn more about the events Ember components use, see
+<<<<<<< HEAD
   [components/handling-events](https://guides.emberjs.com/v2.6.0/components/handling-events/#toc_event-names).
+=======
+
+  [components/handling-events](https://guides.emberjs.com/current/components/handling-events/#toc_event-names).
+>>>>>>> 5d5d92478... [DOC beat] RFC176 api doc update
 
   ### Initializers