Trash cleanup

README.md

@@ -15,8 +15,6 @@ The secondary goal is making Misago a viable foundation for building and maintai
 
 Finally, while Misago is built using Django, it's not a "Django application" and it won't integrate with existing Django projects. This is the result of a design decision to use custom users/session/auth/permissions functionality instead of native Django applications - however, in the future Misago will provide a web API allowing you to add Misago-powered features to your website and/or application.
 
-
-<<<<<<< HEAD
 Requirements
 ------------
 
@@ -26,9 +24,6 @@ Requirements
 * MySQL/Postgres/Oracle Database
 * Pillow Imaging Library for Python
 
-
-=======
->>>>>>> master
 Dependencies
 ------------
 
@@ -82,13 +77,8 @@ sudo python manage.py runserver 192.168.33.10:80 # Private network address as pe
 
 Now navigate to [192.168.33.10](http://192.168.33.10) in your browser of choice to find your forums all set up and ready for testing and development. Puppet will have taken care of bootstrapping your Misago installation with a database, some dummy content and an admin user with the following credentials:
 
-<<<<<<< HEAD
 __Username__: Admin
 __Email__: admin@example.com
-=======
-__Username__: Admin  
-__Email__: admin@example.com  
->>>>>>> master
 __Password__: password
 
 Be aware that the defualt configuration doesn't contain anything besides the bare-minimum for Misago to run - this meaning that things like an SMTP server will have to added manually if you wish to test Misago's email features.
@@ -101,18 +91,12 @@ Misago comes with the "deployment" Python module that contains an empty Misago c
 
 After you set low-level configuration of Misago ([`deployment/settings.py`](deployment/settings.py)), fire the following commands on manage.py through the Python executable:
 
-<<<<<<< HEAD
 * `startmisago [--quiet]`
   Creates the DB structure for Misago and populates it with default data
 * `adduser [--admin] <username> <email> <password>`
   Adds a new user to the database.
-=======
-* `startmisago [--quiet]`  
-  Creates the DB structure for Misago and populates it with default data
-* `adduser [--admin] <username> <email> <password>`  
-  Adds a new user to the database.  
->>>>>>> master
-  Make sure to do something like `adduser Admin admin@example.com password --admin` to add an admin user when you first setup your forums.
+
+Make sure to do something like `adduser Admin admin@example.com password --admin` to add an admin user when you first setup your forums.
 
 Misago stands on shoulders of Django and Django documentation covers deployment of apps extensively: https://docs.djangoproject.com/en/dev/howto/deployment/
 
@@ -126,12 +110,8 @@ Updating
 
 You can use the `updatemisago` command to update your forums database to latest version _unless_ you are updating from `0.1` which is incompatibile with `0.2` and later releases.
 
-<<<<<<< HEAD
-=======
 Support for migrations from `0.1` has been dropped with `0.3` release.
 
->>>>>>> master
-
 Contributing
 ------------
 
@@ -145,21 +125,16 @@ Authors
 
 **Rafał Pitoń**
 
-+ http://rpiton.com
-+ http://github.com/ralfp
-+ https://twitter.com/RafalPiton
+http://rpiton.com
+http://github.com/rafalp
+https://twitter.com/RafalPiton
 
 
 Copyright and license
 ---------------------
 
-<<<<<<< HEAD
-> __Misago__ - Copyright © 2013 [Rafał Pitoń](http://github.com/ralfp)
-> This program comes with ABSOLUTELY NO WARRANTY.
-=======
-> __Misago__ - Copyright © 2013 [Rafał Pitoń](http://github.com/ralfp)  
-> This program comes with ABSOLUTELY NO WARRANTY.  
->>>>>>> master
-> This is free software and you are welcome to redistribute it under the conditions described in the license.
->
-> For the complete license, refer to [LICENSE.md](LICENSE.md)
+__Misago__ - Copyright © 2013 [Rafał Pitoń](http://github.com/ralfp)
+This program comes with ABSOLUTELY NO WARRANTY.
+
+This is free software and you are welcome to redistribute it under the conditions described in the license.
+For the complete license, refer to [LICENSE.md](LICENSE.md)

cron.txt

@@ -1,9 +1,6 @@
 0 3 * * * python $HOME/misago/manage.py clearalerts
 0 3 * * * python $HOME/misago/manage.py clearattempts
-<<<<<<< HEAD
 0 3 * * * python $HOME/misago/manage.py pruneattachments
-=======
->>>>>>> master
 0 */4 * * * python $HOME/misago/manage.py clearsessions
 20 3 * * * python $HOME/misago/manage.py cleartokens
 15 3 * * * python $HOME/misago/manage.py cleartracker
@@ -13,10 +10,6 @@
 10 3 * * * python $HOME/misago/manage.py updateranking
 25 3 * * * python $HOME/misago/manage.py updatethreadranking
 */30 * * * * python $HOME/misago/manage.py countreports
-<<<<<<< HEAD
 0 */2 * * * python $HOME/misago/manage.py update_index --age=3
-=======
-* */2 * * * python $HOME/misago/manage.py update_index --age=2
->>>>>>> master
 # Uncomment next line for heartbeat cron
 #*/3 * * * * python $HOME/misago/heartbeat.py deployment.settings --log=heartbeats.txt

deployment/settings.py

@@ -16,11 +16,7 @@ BOARD_ADDRESS = 'http://somewhere.com'
 ADMIN_PATH = 'admincp'
 
 # System admins
-<<<<<<< HEAD
 # Enter every god admin using following pattern:
-=======
-# Enter every admin using following pattern:
->>>>>>> master
 # ('John', 'john@example.com'),
 # Note trailing separator!
 ADMINS = ()
@@ -89,11 +85,7 @@ TIME_ZONE = 'UTC'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en_US'
 
-<<<<<<< HEAD
 # Absolute filesystem path to the directory that will hold publicly available media uploaded by users.
-=======
-# Absolute filesystem path to the directory that will hold user-uploaded files.
->>>>>>> master
 # Always use forward slashes, even on Windows.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = '/vagrant/media/'
@@ -103,14 +95,11 @@ MEDIA_ROOT = '/vagrant/media/'
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
-<<<<<<< HEAD
 # Absolute filesystem path to the directory that will hold post attachments.
 # Always use forward slashes, even on Windows.
 # Example: "/home/media/media.lawrence.com/attachments/"
 ATTACHMENTS_ROOT = '/vagrant/attachments/'
 
-=======
->>>>>>> master
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # Always use forward slashes, even on Windows.
@@ -146,17 +135,12 @@ EMAIL_HOST_PASSWORD = ''
 # Use TLS encryption
 EMAIL_USE_TLS = False
 
-<<<<<<< HEAD
 # Screamer Configuration
 # Screamer is special feature that sends email to users listed under ADMINS when application
 # erros. First setting is origin of error emails, while second is message title prefix that
 # makes messages easier to spot in your inbox
 SERVER_EMAIL = 'root@localhost'
 EMAIL_SUBJECT_PREFIX = '[Misago Screamer]'
-=======
-# E-mail subject prefix added to emails for staff
-EMAIL_SUBJECT_PREFIX = '[Misago]'
->>>>>>> master
 
 # Catch-all e-mail address
 # If DEBUG_MODE is on, all emails will be sent to this address instead of real recipient.
@@ -192,13 +176,10 @@ WSGI_APPLICATION = 'deployment.wsgi.application'
 if SECRET_KEY == 'yaobeifl1a6hf&3)^uc#^vlu1ud7xp^+*c5zoq*tf)fvs#*o$#':
     SECRET_KEY = ''
 
-<<<<<<< HEAD
 # Disable Jinja2 for django debug toolbar templates
 if DEBUG:
     DEFAULT_JINJA2_TEMPLATE_INTERCEPT_RE = r"(?!debug_toolbar/).*"
 
-=======
->>>>>>> master
 # Override config if we are in tests
 if 'test' in sys.argv:
     if not SECRET_KEY:

requirements.txt

@@ -1,31 +1,15 @@
-<<<<<<< HEAD
 django<1.6
 django-debug-toolbar
 django-floppyforms
 django-haystack
 django-jinja
 django-mptt<0.6
-=======
-django
-django-debug-toolbar
-django-haystack
-django-mptt
-coffin
->>>>>>> master
 jinja2
 markdown
 path.py
 Pillow
-<<<<<<< HEAD
 pytz==2013b
 recaptcha-client
 South<0.9
 Unidecode
 whoosh<2.6
-=======
-pytz
-recaptcha-client
-South
-Unidecode
-whoosh<2.5
->>>>>>> master