X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=moose-class%2Fslides%2Findex.html;fp=moose-class%2Fslides%2Findex.html;h=cf53cbbcc89e18dc4bb1db8b0decb82004579a4b;hb=d961c52547788f5f2023c465b8e7f8e8f8d0d249;hp=3c0ba3102f2fe13623b8ca7e865034a493c52200;hpb=bdd3911c83c8a0dc99a60d6666fa1b0fe726734c;p=gitmo%2Fmoose-presentations.git

diff --git a/moose-class/slides/index.html b/moose-class/slides/index.html
index 3c0ba31..cf53cbb 100644
--- a/moose-class/slides/index.html
+++ b/moose-class/slides/index.html
@@ -1487,22 +1487,6 @@ Integer-&gt;does('Comparable'); # also true!</code></pre>
 </div>
 
 <div class="slide">
-  <h1>Name Conflicts Between Roles</h1>
-
-  <pre><code>package HasSubProcess;
-use Moose::Role;
-
-<span class="highlight">sub execute { ... }</span>
-
-package Killer;
-use Moose::Role;
-
-with 'HasSubProcess';
-
-<span class="highlight">sub execute { ... }</span></code></pre>
-</div>
-
-<div class="slide">
   <h1>Roles as Interfaces</h1>
 
   <ul>