Skip to content

Commit

Permalink
Merge pull request #2 from garemoko/gh-pages
Browse files Browse the repository at this point in the history
get commits wrongly commited to gh-pages
  • Loading branch information
garemoko committed Mar 3, 2013
2 parents da4cec0 + 24eeccd commit fc63d65
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 3 deletions.
Binary file added epic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ <h3>Thoughts</h3>
</li>
</ul>
</div>
<img src="logo.png" width="75px" class="logo garemoko">
<img src="epic.png" width="75px" class="logo garemoko">
<div class="section">
<h2>Epic articles</h2>
<p>
The following articles by me are hosted on <a href="http://www.epic.co.uk" target="_blank">epic.co.uk</a>
The following articles by me are hosted on <a href="http://www.epiclearninggroup.com" target="_blank">the Epic website</a>
</p>
<ul>
<li>
Expand Down
Binary file modified octocat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pages/verbs.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ <h3><span class="mw-headline" id="cancelled_planned_learning">cancelled planned
Object should be a "StatementRef".
</li>
<li>
More info: [<a href="http://www.tincanapi.co.uk/pages/The_Learning_Plan_Framework.html#Cancelled">[1]</a>]
More info: <a href="http://www.tincanapi.co.uk/pages/The_Learning_Plan_Framework.html#Cancelled">The_Learning_Plan_Framework.html#Cancelled</a>
</li>
</ul>

Expand Down
Binary file modified tincanlogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed x.png
Binary file not shown.

0 comments on commit fc63d65

Please sign in to comment.