From 0d4def68ae0d95dd106d2731d60b6d6b635b5afc Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Wed, 2 Feb 2011 17:46:01 -0800
Subject: added more cookbook: work in progress

---
 src/services.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/services.js b/src/services.js
index f54234a6..b7e7c02f 100644
--- a/src/services.js
+++ b/src/services.js
@@ -22,19 +22,14 @@ function angularServiceInject(name, fn, inject, eager) {
  * suffer from window globality.
  *
  * @example
-<<<<<<< HEAD
-   <input ng:init="$window = $service('$window'); greeting='Hello World!'" type="text" name="greeting" />
-   <button ng:click="$window.alert(greeting)">ALERT</button>
-=======
    <doc:example>
      <doc:source>
-       <input ng:init="greeting='Hello World!'" type="text" name="greeting" />
+       <input ng:init="$window = $service('$window'); greeting='Hello World!'" type="text" name="greeting" />
        <button ng:click="$window.alert(greeting)">ALERT</button>
      </doc:source>
      <doc:scenario>
      </doc:scenario>
    </doc:example>
->>>>>>> changed the documentation @example to use <doc:example>
  */
 angularServiceInject("$window", bind(window, identity, window), [], EAGER);
 
-- 
cgit v1.2.3