csseditor
diff --git a/‎.gitignore‎
Lines changed: 5 additions & 1 deletion b/‎.gitignore‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/assets/imgs/bell_icon.png‎
927 Bytes b/‎src/assets/imgs/bell_icon.png‎
927 Bytes
diff --git a/‎src/assets/imgs/bookmarked_icon.png‎
1.7 KB b/‎src/assets/imgs/bookmarked_icon.png‎
1.7 KB
diff --git a/‎src/assets/imgs/check_icon.png‎
672 Bytes b/‎src/assets/imgs/check_icon.png‎
672 Bytes
diff --git a/‎src/assets/imgs/collections_icon.png‎
1.38 KB b/‎src/assets/imgs/collections_icon.png‎
1.38 KB
diff --git a/‎src/assets/imgs/completion_icon.png‎
3.47 KB b/‎src/assets/imgs/completion_icon.png‎
3.47 KB
diff --git a/‎src/assets/imgs/creator_icon.png‎
1.4 KB b/‎src/assets/imgs/creator_icon.png‎
1.4 KB
diff --git a/‎src/assets/imgs/Asset 23.png‎ ‎src/assets/imgs/docs_icon.png‎src/assets/imgs/Asset 23.png renamed to src/assets/imgs/docs_icon.png b/‎src/assets/imgs/Asset 23.png‎ ‎src/assets/imgs/docs_icon.png‎src/assets/imgs/Asset 23.png renamed to src/assets/imgs/docs_icon.png
diff --git a/‎src/assets/imgs/dropdown_icon.png‎
628 Bytes b/‎src/assets/imgs/dropdown_icon.png‎
628 Bytes
diff --git a/‎src/assets/imgs/flag_icon.png‎
519 Bytes b/‎src/assets/imgs/flag_icon.png‎
519 Bytes
@@ -5,5 +5,9 @@ test.js
 dist/
 .DS_Store/
 src/dist/
+<<<<<<< HEAD
+src/notes.txt
+=======
 helpful.js
-jsTests/
+jsTests/
+>>>>>>> master