Skip to content

Commit

Permalink
Merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
@NormanDunbar
NormanDunbar committed Sep 6, 2016
1 parent 3df42e4 commit f255138
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sphinx/source/KeywordsH.clean.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
==========
Keywords H
==========
Expand Down

0 comments on commit f255138

Please sign in to comment.