aboutsummaryrefslogtreecommitdiff
path: root/html/report_page
diff options
context:
space:
mode:
authorNateN1222 <nathannichols454@gmail.com>2018-03-03 20:43:37 -0600
committerNateN1222 <nathannichols454@gmail.com>2018-03-03 20:43:37 -0600
commit3f0d71e0fabc04e346a5b8ea4a3f730bb7f0c9f6 (patch)
tree018a60fdc18c482833a96737623fa4b5f0f32086 /html/report_page
parenta656240e082653865dc40e072b01f15628d0a5e6 (diff)
parentdae60954ec85b7939431b584b06e8f121f91ae6b (diff)
fixed merge conflict
Diffstat (limited to 'html/report_page')
-rw-r--r--html/report_page/report.html0
-rw-r--r--html/report_page/report.js0
2 files changed, 0 insertions, 0 deletions
diff --git a/html/report_page/report.html b/html/report_page/report.html
deleted file mode 100644
index e69de29..0000000
--- a/html/report_page/report.html
+++ /dev/null
diff --git a/html/report_page/report.js b/html/report_page/report.js
deleted file mode 100644
index e69de29..0000000
--- a/html/report_page/report.js
+++ /dev/null