diff options
author | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
---|---|---|
committer | Aditi <aditi.iitr@gmail.com> | 2013-08-22 22:34:06 +0530 |
commit | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch) | |
tree | 7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/oauth/exceptions.py | |
parent | e018b2120ac4131afab6611c84f8cfbe0926e640 (diff) | |
parent | e7b8059f17c98ee88d933af52b0c4d858e882e8e (diff) | |
download | mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip |
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/oauth/exceptions.py')
-rw-r--r-- | mediagoblin/oauth/exceptions.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mediagoblin/oauth/exceptions.py b/mediagoblin/oauth/exceptions.py new file mode 100644 index 00000000..5eccba34 --- /dev/null +++ b/mediagoblin/oauth/exceptions.py @@ -0,0 +1,18 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +class ValidationException(Exception): + pass |