diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-13 18:38:24 +0200 |
| commit | 0eebc808cb298cdc6cd81be93de306a44c523e75 (patch) | |
| tree | 837a7f92cead194db5892c61a45eca164e5af60e /user_guide/doc_style | |
| parent | b55050962bb731d1a99430cd37953e55434236a9 (diff) | |
| parent | 686ff126762c0923556036a3cf73abb9390a7e67 (diff) | |
Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1
Diffstat (limited to 'user_guide/doc_style')
| -rw-r--r-- | user_guide/doc_style/index.html | 2 | ||||
| -rw-r--r-- | user_guide/doc_style/template.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/doc_style/index.html b/user_guide/doc_style/index.html index 824a0cbcf..ad5c65a5b 100644 --- a/user_guide/doc_style/index.html +++ b/user_guide/doc_style/index.html @@ -80,7 +80,7 @@ Previous Topic: <a href="../general/styleguide.html">PHP Style Guide< <a href="../index.html">User Guide Home</a> · Next Topic: <a href="../libraries/benchmark.html">Benchmarking Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> diff --git a/user_guide/doc_style/template.html b/user_guide/doc_style/template.html index d59d5e4ed..3fde59c9e 100644 --- a/user_guide/doc_style/template.html +++ b/user_guide/doc_style/template.html @@ -121,7 +121,7 @@ Previous Topic: <a href="#">Previous Class</a> <a href="#">User Guide Home</a> · Next Topic: <a href="#">Next Class</a> </p> -<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2011 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> +<p><a href="http://codeigniter.com">CodeIgniter</a> · Copyright © 2006 - 2012 · <a href="http://ellislab.com/">EllisLab, Inc.</a></p> </div> </body> |