Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pencilcheck/Spicewords
base: 31c7f2740d
...
head fork: pencilcheck/Spicewords
compare: 3a67eda473
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 10, 2014
Penn Su Works! 6daa9bf
Penn Su Merge branch 'master' of github.com:pencilcheck/Spicewords
Conflicts:
	www/templates/message.html
3a67eda
Showing with 5 additions and 1 deletion.
  1. +0 −1  www/index.html
  2. +5 −0 www/templates/message.html
View
1  www/index.html
@@ -21,7 +21,6 @@
<script src="lib/angularfire/angularfire.js"></script>
<script src="lib/moment/moment.js"></script>
<script src="lib/platform/platform.js"></script>
- <script src="lib/polymer/polymer.js"></script>
<link rel="import" href="lib/core-elements/core-elements.html">
<link rel="import" href="lib/paper-elements/paper-elements.html">
View
5 www/templates/message.html
@@ -39,6 +39,11 @@
</div>
</ion-scroll>
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> 31c7f2740d16fbc963d967e9ae6792d6361606d0
<h2>The List</h2>
<ion-scroll direction="x" scrollbar-y="false" has-bouncing="false" zooming="false" class="wide-as-needed">

No commit comments for this range

Something went wrong with that request. Please try again.