Commits

yup...@localhost  committed eaa402d

f

  • Participants
  • Parent commits a1f11e6

Comments (0)

Files changed (1)

 # -*- coding: utf-8 -*-
 from pprint import pprint
 def main():
-<<<<<<< local
     def _(i):
         print i
-=======
     print "welcome to 42qu's classroom"
->>>>>>> other
     pprint('hello')
     i=0
     while True: