conflict

step1.py

@@ -1,7 +1,10 @@
+# add ...
 # -*- coding: utf-8 -*-
 # author: youxinyu
 # githb: yogayu
 
+# added by daiao
+
 from pyquery import PyQuery as pq
 
 f = open("step2/index.html", encoding='utf-8')
@@ -20,3 +23,13 @@ else:
     result = doc(tag).text()
 print (result, end='')
 
+
+if tag == 'align':
+    h1Align= doc('h1').attr('align')
+    pAlign= doc('p').attr('align')
+    result = (h1Align and pAlign)
+
+
+# print(result),
+print (result, end='')
+