doc: fix a merge artifact

vicb · vicb · commit 9cb74d417412 · 2014-05-01T10:54:48.000+02:00
Conflicts:
	lib/core_dom/tagging_view_factory.dart
diff --git a/lib/core/annotation_src.dart b/lib/core/annotation_src.dart
@@ -563,11 +563,7 @@ abstract class DetachAware {
  *
  *     // Registration
  *     var module = ...;
-<<<<<<< HEAD
- *     module.type(MyFormatter);
-=======
- *     module.bind(MyFilter);
->>>>>>> chore: Replace Module.[type|value|factory]() with Module.bind()
+ *     module.bind(MyFormatter);
  *
  *
  *     <!-- Usage -->

Original file line number	Diff line number	Diff line change
`@@ -563,11 +563,7 @@ abstract class DetachAware {`
`563`	`563`	`*`
`564`	`564`	`* // Registration`
`565`	`565`	`* var module = ...;`
`566`		`-<<<<<<< HEAD`
`567`		`- * module.type(MyFormatter);`
`568`		`-=======`
`569`		`- * module.bind(MyFilter);`
`570`		`->>>>>>> chore: Replace Module.[type\|value\|factory]() with Module.bind()`
	`566`	`+ * module.bind(MyFormatter);`
`571`	`567`	`*`
`572`	`568`	`*`
`573`	`569`	`* <!-- Usage -->`