← Back to branch summary

~vomun-developers/anonplus/vomun-trunk

« back to all changes in this revision

Viewing changes to src/libs/config.py

  • Committer: AJ00200
  • Date: 2011-11-25 21:24:46 UTC
  • mfrom: (158.1.2)
  • Revision ID: git-v1:49f3402d2806f0bf05cba20d985a005227e14638
Fixed merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/config.py
3
3
import os
4
4
import json
5
5
import libs.globals
6
 
from api.functions import register_with_api
 
6
from libs.morado.functions import register_with_api
7
7
 
8
8
CONFIG_PATH = os.path.expanduser("~/.vomun/config.json")
9
9