From: pierre <ratinaud@univ-tlse2.fr>
Date: Thu, 1 Oct 2020 14:57:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=101e493f4787c751b2b1e1fabff4b5b61a14114d;p=iramuteq

Merge remote-tracking branch 'origin/master'
---

101e493f4787c751b2b1e1fabff4b5b61a14114d
diff --cc iramuteq.py
index 2ab3cda,d653391..6dfa3ea
--- a/iramuteq.py
+++ b/iramuteq.py
@@@ -1,8 -1,9 +1,9 @@@
  #!/bin/env python
  # -*- coding: utf-8 -*-
  #Author: Pierre Ratinaud
 -#Copyright (c) 2008-2016, Pierre Ratinaud
 +#Copyright (c) 2008-2020, Pierre Ratinaud
  #License: GNU GPL
+ #test
  
  from optparse import OptionParser