Resolve merge conflicts

wet-boew · Nov 9, 2012 · 5419b6a · 5419b6a
2 parents 6e8da7c + a630619
commit 5419b6a
Show file tree

Hide file tree

Showing 201 changed files with 1,352 additions and 1,273 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,5 @@ Thumbs.db
 /.project
 jshint.out.xml
 *.orig
-*.tmp
+*.tmp
+*.log
diff --git a/build/grids/css/util-ie-min.css b/build/grids/css/util-ie-min.css
diff --git a/build/grids/css/util-min.css b/build/grids/css/util-min.css
diff --git a/build/js/css/pe-ap-ie-min.css b/build/js/css/pe-ap-ie-min.css
diff --git a/build/js/css/pe-ap-min.css b/build/js/css/pe-ap-min.css
diff --git a/build/js/i18n/es-min.js b/build/js/i18n/es-min.js
diff --git a/build/js/i18n/formvalid/messages_ar-min.js b/build/js/i18n/formvalid/messages_ar-min.js
diff --git a/build/js/i18n/formvalid/messages_bg-min.js b/build/js/i18n/formvalid/messages_bg-min.js
diff --git a/build/js/i18n/formvalid/messages_ca-min.js b/build/js/i18n/formvalid/messages_ca-min.js