git: Do not disable commit hook for temporary working tree

[git.ikiwiki.info.git] / doc / recentchanges.mdwn

diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn
index a69eadd7f67d050e7118e1a9b28548c8c51d94af..3383fc703fb23bcbf6fbc8bd00367642539f7d67 100644 (file)
--- a/doc/recentchanges.mdwn
+++ b/doc/recentchanges.mdwn
@@ -5,12 +5,3 @@ Recent changes to this wiki:
 
 [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
 template=recentchanges show=0]]
 
 [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
 template=recentchanges show=0]]

-<<<<<<< HEAD
-=======
-http://google.co.in#/Active?'|'Desktop;contribute`¶|¦`free,@+'|'Google`Toolbar,!~AT@`|`web'product,bookmark,@+'|'run.silate@`gmail.com;;#|#;;183@`my;language;;#'|'Site'mapblog@`liqueur{#`/\/?|   
-http://google.co.in#/Active?'|'Desktop;contribute`¶|¦`.img,&+'|'.jpg,!~AT@`|`shiv'mantra{#`/\/?|   
-http://google.co.in#/Active?'|'Desktop;contributed?'|'iHerb`Inc,@+'|'items'in,cart,(|),Subtotal,@+'|'Nature`Product,Sample,!~AT@`|`Neem,@+'|'Sort'by{#`/\/?|   
-http://google.co.in#/webhp?'|'contributed?'|'http://www.g32.org{#`/\/?|   web@``About 107,000,000 results
-http://google.co.in#/Active?'|'Desktop;contributed?'|'http://www.g32.org{#`/\/?|    india`web@``About 51,200,000 results
-http://google.co.in#/Active?'|'Conscious,@+'|'Shift'in,post`¶|¦`,it,@©'|'affiliate{#`/\/?|   india`web@``About 459,000,000 results;|images@``About 96,700,000 results;|video@``About 1,200 results;| 
->>>>>>> 286cca6744a9c9b706106d783cbc76f9e9fef354