merge yaml conflict

mckoss · May 3, 2012 · 993a83e · 993a83e
2 parents 6c83c9d + f8cf7a6
commit 993a83e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/app.yaml b/app/app.yaml
@@ -36,4 +36,8 @@ skip_files:
 - ^.*\.bak$
 - ^.*\.orig$
 - ^.*/TAGS$
-- ^js/libs/jquery-mobile/demos
+<<<<<<< HEAD
+- ^js/libs/jquery-mobile/demos
+=======
+- ^js/libs/jquery-mobile/demos
+>>>>>>> f8cf7a6d1080737b2db6f027aeadaabd972dda11