aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://smcv.pseudorandom.co.uk/ <smcv@web>2014-05-26 08:07:04 -0400
committeradmin <admin@branchable.com>2014-05-26 08:07:04 -0400
commit86726d352bb3f9ff50bfa0ec4369a53b9700539c (patch)
treeb34682228df87d4976f517af4aab01831bf37f7d
parent667620de291c22eb38d7ca5c304648cd7d12fc57 (diff)
downloadikiwiki-86726d352bb3f9ff50bfa0ec4369a53b9700539c.tar
ikiwiki-86726d352bb3f9ff50bfa0ec4369a53b9700539c.tar.gz
despam
This reverts commit 3354c56985baa96870d20a1f2b8df31227b6c49b
-rw-r--r--doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
index 777714d99..73da32d0c 100644
--- a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
+++ b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
@@ -95,7 +95,7 @@ preferred one?
>>>>>>>> seems to be the future of YAML in Perl, and 2. is depended on
>>>>>>>> by other popular software such as dh-make-perl (on the 2nd
>>>>>>>> degree), I suggest using it explicitly instead of the current
->>>>>>>> "try to support every single YAML Perl module and end up [Jasa seo jakarta](http://digiadvertise.wordpress.com/2014/04/07/jasa-seo-di-jakarta), [Wedding organizer](http://andreweweww.wordpress.com/2014/01/19/lovely-mwo-muslim-wedding-organizer)
+>>>>>>>> "try to support every single YAML Perl module and end up
>>>>>>>> conflicting with the now recommended one" nightmare.
>>>>>>>> --[[intrigeri]]