X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0991c1c43a7394b146bd854af771adcfb1689331..fc7119505840b4156c5a13f1dab0cafbf3af2700:/doc/recentchanges.mdwn?ds=sidebyside

diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn
index 2eb8d3946..3383fc703 100644
--- a/doc/recentchanges.mdwn
+++ b/doc/recentchanges.mdwn
@@ -5,25 +5,3 @@ Recent changes to this wiki:
 
 [[!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;| 
-|''{http://google.co.in#/Active?'|'Conscious,@+'|'Shift'in,post,(|),OM'Karim((|))Lakhani@`laksmi(((|)))creative'say,@+'|'DIY`attitude,!~AT@`|`open`source,&+'|'DNA'model;;#|#;;fully`free,@+'|'MMORPG;;#'|'massively,@+'|'multiplayer;;#'|'online,@+'|'roleplaying;;#'|'development'of,myriad,@+'|'universes{#`/\/?|   
-|''{http://google.co.in#/Active?'|'post`¶|¦`chuggers'in,cyberspace((|))encouraging,@+'|'tracking(((|)))Project,!~AT@`|`Agape;;#'|'Causes,&+'|'application,@©'|'Facebook{#`/\/?|   
-|''{http://google.co.in#/Active?'|'colloquium,!~AT@`|`Desktop,@+'|'contribute{#`/\/?|   
-|''{http://google.co.in#/Active?'|'Desktop;contribute`¶|¦`DMX`CA100((|))SANYO(((|)))Waterproof`Full,!~AT@`|`HD,@+'|'Dual;;#'|'Camera{#`/\/?|   
-|''{http://google.co.in#/Active?'|'Desktop;contribute`¶|¦`Drift`Innovation((|))X170(((|)))Action`Camera,!~AT@`|`helmet'cam,@+'|'filming;;#|#;;point'of,view,@+'|'photo,&+'|'video{#`/\/?|   
-|''{http://google.co.in#/Active?'|'Conscious,@+'|'Shift'in,post`¶|¦`remedie((|))problem,@+'|'related'to,!~AT@`|`planet;;#|#;;Online`describe,@+'|'astrological;;#'|'thesis'of,@©'|'Lal'Kitab{#`/\/?|   
-|''{http://google.co.in#/Active?'|'Conscious,@+'|'Shift'in,post`¶|¦`Sarvabadha;;#'|'Prashmanam,!~AT@`|`Trailokyakhileshwari{#`/\/?|   
-|''{http://google.co.in#/Active?'|'Desktop;contribute`¶|¦`Online,@+'|'Patna'Bihar((|))Acharya`Sampurnanand,!~AT@`|'Just'Dial,@+'|'91-9431695103{#`/\/?|   
-
-
-
-
-
-