Skip to content

gargantext
gargantext
Commit b0a0cef0 authored by Administrator's avatar Administrator
Browse files
Options

Fix conflict.

parent ce193205
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
init/init_gargantext.py
View file @ b0a0cef0
...@@ -62,6 +62,7 @@ for language in pycountry.languages: ...@@ -62,6 +62,7 @@ for language in pycountry.languages:
# Integration: users # Integration: users
<<<<<<< Updated upstream
print('Initialize users...') print('Initialize users...')
me = models.User.objects.get_or_create(username='alexandre') me = models.User.objects.get_or_create(username='alexandre')
......
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