Skip to content

R
red-ci-cd
Commit ee138476 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

Merge pull request #490 in RMS/api-main-service from red-develop to RMSv2 

* commit 'ac73a2e5':
  remove conflict
parents 286ec03f ac73a2e5
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
app/entities/models.py
View file @ ee138476
...@@ -9,14 +9,9 @@ from . import enums ...@@ -9,14 +9,9 @@ from . import enums
from django.utils.text import slugify from django.utils.text import slugify
from datetime import timedelta from datetime import timedelta
import os import os
<<<<<<< HEAD
<<<<<<< HEAD
=======
from django.conf import settings
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
=======
from django.conf import settings from django.conf import settings
>>>>>>> bd79850f02d697447131ae812adc4b42cf78960a
# ********************* AUTH TABLES ********************* # ********************* AUTH TABLES *********************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment