Skip to content

Commit

Permalink
fixing merge conflict regarding MANIFEST
Browse files Browse the repository at this point in the history
  • Loading branch information
Hallvord Reiar M. Steen committed May 21, 2013
2 parents 3ce151c + 4ee5b70 commit 116d43a
Show file tree
Hide file tree
Showing 2,785 changed files with 92,106 additions and 18,621 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "resources"]
path = resources
url = git@github.com:w3c/testharness.js.git
url = git://github.com/w3c/testharness.js.git
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 116d43a

Please sign in to comment.