Permalink
Browse files

removed conflicts

  • Loading branch information...
arunagw committed May 24, 2012
1 parent 59cdeb6 commit 65817a91231e4647bec04557fc80030da6633b1f
Showing with 0 additions and 9 deletions.
  1. +0 −9 organizations.md
View
@@ -5,12 +5,3 @@ header : Members
group: navigation
---
{% include JB/setup %}
-
-<<<<<<< HEAD:members.html
-{% assign posts_collate = site.posts %}
-{% include JB/posts_collate %}
-
-=======
-
-
->>>>>>> 410f4ee790aa28c1cad3bc38792838a85ef3f963:organizations.md

0 comments on commit 65817a9

Please sign in to comment.