From 446e958b5de4ed25d37eb2c7db5cc37afbac25dd Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Fri, 17 Jun 2011 09:11:03 +0200
Subject: [PATCH] Rename PDFFonts.js to fonts.js
---
PDFFont.js => fonts.js | 0
PDFFontUtils.js => fonts_utils.js | 0
test.html | 7 +++----
3 files changed, 3 insertions(+), 4 deletions(-)
rename PDFFont.js => fonts.js (100%)
rename PDFFontUtils.js => fonts_utils.js (100%)
diff --git a/PDFFont.js b/fonts.js
similarity index 100%
rename from PDFFont.js
rename to fonts.js
diff --git a/PDFFontUtils.js b/fonts_utils.js
similarity index 100%
rename from PDFFontUtils.js
rename to fonts_utils.js
diff --git a/test.html b/test.html
index 276ba30da..023cdeec2 100644
--- a/test.html
+++ b/test.html
@@ -1,15 +1,14 @@
-<<<<<<< HEAD
Simple pdf.js page viewer
-
+
+
-
-
+