projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove >>> conflict markers.
[pspp-builds.git]
/
src
/
subclist.c
diff --git
a/src/subclist.c
b/src/subclist.c
index 2a7f3679d955f7390557360fa3cab56f59fec5cd..6f5898f146b089aee2c25367423cb7341bfd7bef 100644
(file)
--- a/
src/subclist.c
+++ b/
src/subclist.c
@@
-17,8
+17,8
@@
General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
-0211
1-1307
, USA. */
+Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+0211
0-1301
, USA. */
#include "subclist.h"
#include "subclist.h"