changeset
Missed a merge conflict
Fri, 10 Mar 2017 21:45:49 -0600
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 10 Mar 2017 21:45:49 -0600
- changeset 38241
- 3be724397dfd
- parent 38240
- 0552f69f1996
- child 38242
- 640928dfa2fc
Missed a merge conflict
| configure.ac | file | annotate | diff | comparison | revisions |
--- a/configure.ac Fri Mar 10 20:36:55 2017 -0600 +++ b/configure.ac Fri Mar 10 21:45:49 2017 -0600 @@ -2246,16 +2246,7 @@ libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile -<<<<<<< working copy libpurple/protocols/jabber/tests/Makefile - libpurple/protocols/msn/Makefile - libpurple/protocols/mxit/Makefile -||||||| base - libpurple/protocols/msn/Makefile - libpurple/protocols/myspace/Makefile - libpurple/protocols/mxit/Makefile -======= ->>>>>>> merge rev libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile @@ -2263,13 +2254,6 @@ libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/simple/Makefile -<<<<<<< working copy - libpurple/protocols/yahoo/Makefile - libpurple/protocols/yahoo/tests/Makefile -||||||| base - libpurple/protocols/yahoo/Makefile -======= ->>>>>>> merge rev libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h
