dealing with merge

ChildrenOfUr · May 26, 2015 · 270b6a3 · 270b6a3
2 parents 806d85c + 5c79f54
commit 270b6a3
Show file tree

Hide file tree

Showing 99 changed files with 5,294 additions and 3,729 deletions.
diff --git a/lib/components/auction_list/auction.dart b/lib/components/auction_list/auction.dart
diff --git a/lib/components/auction_list/auction_list.css b/lib/components/auction_list/auction_list.css
diff --git a/lib/components/auction_list/auction_list.dart b/lib/components/auction_list/auction_list.dart
diff --git a/lib/components/auction_list/auction_list.html b/lib/components/auction_list/auction_list.html
diff --git a/lib/components/components_import.html b/lib/components/components_import.html
@@ -0,0 +1,6 @@
+<link rel="import" href="../../../packages/cou_toolkit/toolkit/toolkit.html">
+<link rel="import" href="../../../packages/cou_auction_house/auction_house/auction_house.html">
+<link rel="import" href="../../../packages/couclient/components/musicplayer/musicplayer.html">
+<link rel="import" href="../../../packages/couclient/components/meters/meters.html">
+<link rel="import" href="../../../packages/cou_login/login/login.html">
+<link rel="import" href="../../../packages/couclient/components/mailbox/mailbox.html">
diff --git a/lib/components/inventory/inventory.html b/lib/components/inventory/inventory.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <link rel="import" href="../../../../packages/polymer/polymer.html">
-<link rel="import" href="../../../../packages/couclient/toolkit/toolkit.html"> 
+<link rel="import" href="../../../../packages/cou_toolkit/toolkit/toolkit.html">
 
 <polymer-element name="ur-inventory">
   <template>

diff --git a/lib/components/login/login.dart b/lib/components/login/login.dart