From ac8cd8368effabbf1cbf6788b07327e0d0f5e451 Mon Sep 17 00:00:00 2001
From: Steven Fuchs <stwf@yahoo.com>
Date: Wed, 7 Mar 2012 21:01:15 -0500
Subject: [PATCH] fixing conflicts in merge

---
 spec/javascripts/aspect-spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 spec/javascripts/aspect-spec.js

diff --git a/spec/javascripts/aspect-spec.js b/spec/javascripts/aspect-spec.js
new file mode 100644
index 000000000..36dac1f17
--- /dev/null
+++ b/spec/javascripts/aspect-spec.js
@@ -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();
+    });
+  });
+});