diff options
| author | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
|---|---|---|
| committer | Will Song <incertia9474@gmail.com> | 2015-05-29 19:53:37 -0500 |
| commit | 9463c6719036957c8468e1363a48afbfe751fd3e (patch) | |
| tree | aed6ccd050fc182a0d4d111bef6f743d28a42a73 /src/chat_state.h | |
| parent | 7f436d614b11d72893d856f1c3d817ab34b0b9eb (diff) | |
| parent | 304e08a9c0bfa27ed84dc1ff0a2e2d32b36529f8 (diff) | |
| download | profani-tty-9463c6719036957c8468e1363a48afbfe751fd3e.tar.gz | |
fix conflicts
Diffstat (limited to 'src/chat_state.h')
| -rw-r--r-- | src/chat_state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chat_state.h b/src/chat_state.h index ba394a56..7f0d8832 100644 --- a/src/chat_state.h +++ b/src/chat_state.h @@ -1,7 +1,7 @@ /* * chat_state.h * - * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com> + * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> * * This file is part of Profanity. * |