fixing conflicts in merge

This commit is contained in:
Steven Fuchs 2012-03-07 21:01:15 -05:00
parent 7048fa6d50
commit ac8cd8368e

View file

@ -0,0 +1,12 @@
describe("Diaspora.Aspects", function() {
beforeEach(function() {
spec.loadFixture("aspects_index");
});
describe("edit aspect name", function() {
it("it should ", function() {
var startName = $("a [data-aspect_id=13]").text();
});
});
});