src/lib/Server/Reports/reports/models.py.rej


1
2
3
4
5
6
7
8
9
10
11
12
13
14
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