summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Reports/reports/models.py.rej
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Server/Reports/reports/models.py.rej')
-rw-r--r--src/lib/Server/Reports/reports/models.py.rej15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/Server/Reports/reports/models.py.rej b/src/lib/Server/Reports/reports/models.py.rej
new file mode 100644
index 000000000..c8e1b2229
--- /dev/null
+++ b/src/lib/Server/Reports/reports/models.py.rej
@@ -0,0 +1,15 @@
+***************
+*** 1,6 ****
+ """Django models for Bcfg2 reports."""
+ from django.db import models
+- from django.db.models import Q
+ from datetime import datetime, timedelta
+ from time import strptime
+
+--- 1,6 ----
+ """Django models for Bcfg2 reports."""
+ from django.db import models
++ from django.db.models import Q, Max
+ from datetime import datetime, timedelta
+ from time import strptime
+