Only generate zips for Chrome extension samples whose contents have changed.

chrome/common/extensions/docs/permission_warnings.html

Index: chrome/common/extensions/docs/permission_warnings.html
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html
index 4363047fd3d002c2c88fe438b465f6e689e190fe..9a762940af257f900428ac6dc45a022591e1c3b2 100644
--- a/chrome/common/extensions/docs/permission_warnings.html
+++ b/chrome/common/extensions/docs/permission_warnings.html
@@ -95,11 +95,7 @@
               <div>
               </div>
             </div>
-<<<<<<< HEAD
           </dl>
-=======
-          </dl>         
->>>>>>> All communication with the cloud print proxy service from the browser now happens in the CloudPrintProxyService class. Added code to start the service process if the cloud print proxy was enabled. Also, when detect an auto-update, we send an IPC to the service process. The service process then shuts down when the browser disconnects.
         </div>
       </div> <!-- /SUBTEMPLATES -->
 
@@ -230,12 +226,9 @@
          <li><h2><a href="samples.html">Samples</a></h2></li>
         </ul>
       </div>
-<<<<<<< HEAD
       <script>
         initToggles();
       </script>
-=======
->>>>>>> All communication with the cloud print proxy service from the browser now happens in the CloudPrintProxyService class. Added code to start the service process if the cloud print proxy was enabled. Also, when detect an auto-update, we send an IPC to the service process. The service process then shuts down when the browser disconnects.
 
     <div class="g-unit" id="gc-pagecontent">
       <div id="pageTitle">